Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-copy-move-merge.out
author Patrick Mezard <pmezard@gmail.com>
Tue, 17 Jul 2007 23:33:42 +0200
changeset 5083 73169e5d2732
parent 5059 8d9bdcbb2b18
child 5371 17ed9b9a0d03
permissions -rw-r--r--
posixfile_nt: '+' was understood as read mode instead of update.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     1
 
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     2
 
resolving manifests
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     3
 
 overwrite None partial False
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     4
 
 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     5
 
 a: remote moved to c -> m
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     6
 
 a: remote moved to b -> m
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     7
 
copying a to b
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     8
 
copying a to c
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     9
 
merging a and b
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    10
 
my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    11
 
removing a
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    12
 
merging a and c
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    13
 
my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    14
 
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    15
 
(branch merge, don't forget to commit)
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    16
 
-- b --
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    17
 
0
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    18
 
1
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    19
 
2
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    20
 
-- c --
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    21
 
0
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    22
 
1
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
    23
 
2
mercurial-crew-with-dirclash