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