Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge1.out @ 3295:764688cf51e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 19:57:45 -0500
parents ae85272b59a4
children e7abcf3a7c5f
comparison
equal deleted inserted replaced
3291:0b5d626b354e 3295:764688cf51e5
18 a 18 a
19 M b2 19 M b2
20 R a 20 R a
21 C c2 21 C c2
22 blahblah 22 blahblah
23 rev offset length base linkrev nodeid p1 p2
24 0 0 67 0 1 dc51707dfc98 000000000000 000000000000
25 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98
26 renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66