Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename-merge1.out @ 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 checkout | |
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
3 merge | |
4 resolving manifests | |
5 overwrite None branchmerge True partial False | |
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c | |
7 b: remote created -> g | |
8 b2: remote created -> g | |
9 getting b | |
10 getting b2 | |
11 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 (branch merge, don't forget to commit) | |
13 blahblah | |
14 foo |