equal
deleted
inserted
replaced
62 blahblah |
62 blahblah |
63 |
63 |
64 $ hg ci -m "merge" |
64 $ hg ci -m "merge" |
65 |
65 |
66 $ hg debugindex b |
66 $ hg debugindex b |
67 rev offset length ..... linkrev nodeid p1 p2 (re) |
67 rev offset length linkrev nodeid p1 p2 |
68 0 0 67 ..... 1 57eacc201a7f 000000000000 000000000000 (re) |
68 0 0 67 1 57eacc201a7f 000000000000 000000000000 |
69 1 67 72 ..... 3 4727ba907962 000000000000 57eacc201a7f (re) |
69 1 67 72 3 4727ba907962 000000000000 57eacc201a7f |
70 |
70 |
71 $ hg debugrename b |
71 $ hg debugrename b |
72 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |
72 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |
73 |
73 |
74 This used to trigger a "divergent renames" warning, despite no renames |
74 This used to trigger a "divergent renames" warning, despite no renames |