Mercurial > hg
annotate tests/test-merge-types.out @ 7574:4afc3208a7b8
tests: use killdaemons.py in test-pull-http
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Sat, 03 Jan 2009 20:20:40 +0100 |
parents | 8dca507e56ce |
children | af5f099d932b |
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 |
5710 | 4 resolving manifests |
5 overwrite None partial False | |
6 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c | |
7 searching for copies back to rev 1 | |
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 | |
16 resolving manifests | |
17 overwrite None partial False | |
18 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f | |
19 searching for copies back to rev 1 | |
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) |