Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-addremove.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 | ff3ea21a981a |
children |
rev | line source |
---|---|
1623
eef8ff46567a
Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 adding dir/bar |
eef8ff46567a
Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 adding foo |
eef8ff46567a
Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 dir/bar |
eef8ff46567a
Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
4 foo |
eef8ff46567a
Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 adding dir/bar_2 |
eef8ff46567a
Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
6 adding foo_2 |
eef8ff46567a
Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
7 dir/bar_2 |
eef8ff46567a
Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
8 foo_2 |
2958
ff3ea21a981a
addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2955
diff
changeset
|
9 adding a |
ff3ea21a981a
addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2955
diff
changeset
|
10 adding c |
ff3ea21a981a
addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2955
diff
changeset
|
11 adding b |
ff3ea21a981a
addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2955
diff
changeset
|
12 adding d |
ff3ea21a981a
addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2955
diff
changeset
|
13 removing a |
ff3ea21a981a
addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2955
diff
changeset
|
14 removing c |
ff3ea21a981a
addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2955
diff
changeset
|
15 recording removal of a as rename to b (100% similar) |