Mercurial > hg

annotate tests/test-merge-types.out @ 11642:7f3581c5ad93 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gendoc: remove callable usage (check-code)
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Thu, 22 Jul 2010 14:30:29 +0900
parents ba5e508b5e92
children db426935fa94
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5710
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
1 adding a
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
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
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
5 resolving manifests
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
6 overwrite None partial False
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
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
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
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
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
13 (branch merge, don't forget to commit)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
14 % symlink is local parent, executable is other
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
15 a has no flags (default for conflicts)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
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
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
18 resolving manifests
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
19 overwrite None partial False
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
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
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
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
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
25 getting a
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
27 (branch merge, don't forget to commit)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
28 % symlink is other parent, executable is local
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
29 a has no flags (default for conflicts)