Mercurial > hg
annotate tests/test-merge-types.out @ 10444:e99e0e077bc4
minirst: report pruned container types
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 13 Feb 2010 18:11:08 +0100 |
parents | ba5e508b5e92 |
children | db426935fa94 |
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 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
11 update: a 1/1 files (100.00%) |
5710 | 12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13 (branch merge, don't forget to commit) | |
14 % symlink is local parent, executable is other | |
15 a has no flags (default for conflicts) | |
16 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
|
17 searching for copies back to rev 1 |
5710 | 18 resolving manifests |
19 overwrite None partial False | |
20 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
|
21 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
|
22 (n)one, e(x)ec or sym(l)ink? n |
5710 | 23 a: remote is newer -> g |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
24 update: a 1/1 files (100.00%) |
5710 | 25 getting a |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
27 (branch merge, don't forget to commit) | |
28 % symlink is other parent, executable is local | |
29 a has no flags (default for conflicts) |