Mercurial > hg-stable

annotate tests/test-addremove.out @ 10251:a19d2993385d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix merging of already merged subrepos (issue1986) This fixes a bug seen when merging a main repo which contains a subrepo when both repos have been merged before. Each repo (main and sub) has two branches, both of which have been merged before. In a subrepo, if the revision to merge to is an ancestor of the current rev, then the merge should be a noop. Test provided by Steve Losh.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 15 Jan 2010 21:08:04 +0100
parents 627399330c7d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
6935
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents: 6934
diff changeset
5 committed changeset 0:d44511117907
1623
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
6 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
7 adding foo_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
8 dir/bar_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
9 foo_2
6935
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents: 6934
diff changeset
10 committed changeset 1:a85812e0561a
2958
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2955
diff changeset
11 adding a
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2955
diff changeset
12 adding c
6827
c978d6752dbb dirstate.walk: push sorting up
Matt Mackall <mpm@selenic.com>
parents: 2958
diff changeset
13 removing a
2958
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2955
diff changeset
14 adding b
6827
c978d6752dbb dirstate.walk: push sorting up
Matt Mackall <mpm@selenic.com>
parents: 2958
diff changeset
15 removing c
2958
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2955
diff changeset
16 adding d
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2955
diff changeset
17 recording removal of a as rename to b (100% similar)
8990
627399330c7d addremove: build lists of already added and removed files too (issue1696)
Matt Mackall <mpm@selenic.com>
parents: 6935
diff changeset
18 removing a
627399330c7d addremove: build lists of already added and removed files too (issue1696)
Matt Mackall <mpm@selenic.com>
parents: 6935
diff changeset
19 adding b
627399330c7d addremove: build lists of already added and removed files too (issue1696)
Matt Mackall <mpm@selenic.com>
parents: 6935
diff changeset
20 removing c
627399330c7d addremove: build lists of already added and removed files too (issue1696)
Matt Mackall <mpm@selenic.com>
parents: 6935
diff changeset
21 adding d
627399330c7d addremove: build lists of already added and removed files too (issue1696)
Matt Mackall <mpm@selenic.com>
parents: 6935
diff changeset
22 recording removal of a as rename to b (100% similar)