Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-types.out
author John Mulligan <phlogistonjohn@asynchrono.us>
Sat, 18 Oct 2008 14:43:14 -0400
changeset 7141 8d1bdaf842de
parent 6336 4b0c9c674707
child 7320 8dca507e56ce
permissions -rw-r--r--
issue 1144: prevent traceback on verify of bundles
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
5710
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
     4
 
resolving manifests
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
     5
 
 overwrite None partial False
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
     6
 
 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
     7
 
  searching for copies back to rev 1
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
     8
 
 a: update permissions -> e
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
     9
 
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 
    10
 
(branch merge, don't forget to commit)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    11
 
% symlink is local parent, executable is other
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    12
 
a has no flags (default for conflicts)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    13
 
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 
    14
 
resolving manifests
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    15
 
 overwrite None partial False
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    16
 
 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    17
 
  searching for copies back to rev 1
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    18
 
 a: remote is newer -> g
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    19
 
getting a
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    20
 
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 
    21
 
(branch merge, don't forget to commit)
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    22
 
% symlink is other parent, executable is local
026eb80060d8 update test-merge-types
Matt Mackall <mpm@selenic.com>
parents: 5509
diff changeset 
    23
 
a has no flags (default for conflicts)
Mercurial