Mercurial > hg

annotate tests/test-merge-types.out @ 6064:c608f67a87c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add test-inherit-mode
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 09 Feb 2008 18:38:54 -0200
parents 026eb80060d8
children 4b0c9c674707
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
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
3 resolving manifests
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
4 overwrite None partial False
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
5 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
6 searching for copies back to rev 1
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
7 a: update permissions -> e
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
8 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
9 (branch merge, don't forget to commit)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
10 % symlink is local parent, executable is other
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
11 a has no flags (default for conflicts)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
12 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
13 resolving manifests
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
14 overwrite None partial False
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
15 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
16 searching for copies back to rev 1
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
17 a: remote is newer -> g
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
18 getting a
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
19 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
20 (branch merge, don't forget to commit)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
21 % symlink is other parent, executable is local
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset
22 a has no flags (default for conflicts)