Mercurial > hg

annotate tests/test-merge-revert.out @ 9899:be574a37a8ae stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
author Greg Ward <greg@gerg.ca>
date Wed, 18 Nov 2009 22:23:11 -0500
parents d2b55e3c4e25
children 4c94b6d0fb1c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
1 1:016807e6fdaf
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
2 0:eb43f19ff115
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
3 016807e6fdaf tip
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2036
diff changeset
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
5 eb43f19ff115
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
6 eb43f19ff115+
2029
d436b21b20dc rewrite revert command. fix issues 93, 123, 147.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
7 reverting file1
2030
8d9ec30d58bc forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2029
diff changeset
8 ? file1.orig
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
9 eb43f19ff115
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2036
diff changeset
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2030
8d9ec30d58bc forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2029
diff changeset
11 ? file1.orig
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
12 016807e6fdaf tip
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2036
diff changeset
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3400
d2b55e3c4e25 merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2030
8d9ec30d58bc forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2029
diff changeset
15 ? file1.orig
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
16 016807e6fdaf tip
2030
8d9ec30d58bc forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2029
diff changeset
17 ? file1.orig
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
18 016807e6fdaf tip
2030
8d9ec30d58bc forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2029
diff changeset
19 ? file1.orig
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
20 016807e6fdaf tip
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2036
diff changeset
21 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2030
8d9ec30d58bc forgot to rerun tests after changed backup extension to .orig.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2029
diff changeset
22 ? file1.orig
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
23 016807e6fdaf tip