Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge1 @ 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 c93ce7f10f85
children c0b449154a90
comparison
equal deleted inserted replaced
3291:0b5d626b354e 3295:764688cf51e5
21 echo "merge" 21 echo "merge"
22 hg merge -y --debug 22 hg merge -y --debug
23 hg status -AC 23 hg status -AC
24 cat b 24 cat b
25 hg ci -m "merge" -d "0 0" 25 hg ci -m "merge" -d "0 0"
26 hg debugindex .hg/data/b.i
27 hg debugrename b