Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename-merge1 @ 3155:c82ea81d6850
Add core copy detection algorithm
This adds findcopies, which detects merge-relevant copies between
files in a pair of manifests back to the merge ancestor.
While the merge code invokes the copy detection routine, it does not
yet use the result.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 25 Sep 2006 16:45:31 -0500 |
parents | |
children | c93ce7f10f85 |
comparison
equal
deleted
inserted
replaced
3154:15d585dcdd1c | 3155:c82ea81d6850 |
---|---|
1 #!/bin/sh | |
2 | |
3 mkdir t | |
4 cd t | |
5 hg init | |
6 echo foo > a | |
7 echo foo > a2 | |
8 hg add a a2 | |
9 hg ci -m "start" -d "0 0" | |
10 hg mv a b | |
11 hg mv a2 b2 | |
12 hg ci -m "rename" -d "0 0" | |
13 echo "checkout" | |
14 hg co 0 | |
15 echo blahblah > a | |
16 echo blahblah > a2 | |
17 hg mv a2 c2 | |
18 hg ci -m "modify" -d "0 0" | |
19 echo "merge" | |
20 hg merge -y --debug | |
21 cat a | |
22 cat b | |
23 hg ci -m "merge" -d "0 0" |