Mercurial > public > mercurial-scm > hg-stable
diff tests/test-rename-merge1 @ 3153: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 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-rename-merge1 Mon Sep 25 16:45:31 2006 -0500 @@ -0,0 +1,23 @@ +#!/bin/sh + +mkdir t +cd t +hg init +echo foo > a +echo foo > a2 +hg add a a2 +hg ci -m "start" -d "0 0" +hg mv a b +hg mv a2 b2 +hg ci -m "rename" -d "0 0" +echo "checkout" +hg co 0 +echo blahblah > a +echo blahblah > a2 +hg mv a2 c2 +hg ci -m "modify" -d "0 0" +echo "merge" +hg merge -y --debug +cat a +cat b +hg ci -m "merge" -d "0 0"