Mercurial > hg
annotate tests/test-merge-types.out @ 9899:be574a37a8ae stable
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 | af5f099d932b |
children | ba5e508b5e92 |
rev | line source |
---|---|
5710 | 1 adding a |
2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5710
diff
changeset
|
3 created new head |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
7320
diff
changeset
|
4 searching for copies back to rev 1 |
5710 | 5 resolving manifests |
6 overwrite None partial False | |
7 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c | |
7320
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6336
diff
changeset
|
8 conflicting flags for a |
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6336
diff
changeset
|
9 (n)one, e(x)ec or sym(l)ink? n |
5710 | 10 a: update permissions -> e |
11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 (branch merge, don't forget to commit) | |
13 % symlink is local parent, executable is other | |
14 a has no flags (default for conflicts) | |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
7320
diff
changeset
|
16 searching for copies back to rev 1 |
5710 | 17 resolving manifests |
18 overwrite None partial False | |
19 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f | |
7320
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6336
diff
changeset
|
20 conflicting flags for a |
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6336
diff
changeset
|
21 (n)one, e(x)ec or sym(l)ink? n |
5710 | 22 a: remote is newer -> g |
23 getting a | |
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
25 (branch merge, don't forget to commit) | |
26 % symlink is other parent, executable is local | |
27 a has no flags (default for conflicts) |