Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 3095:92a0c2200e41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use context code to retrieve manifests
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 19:32:16 -0500
parents 87a0332ab58b
children 40e777bda455
comparison
equal deleted inserted replaced
3007:962b9c7df641 3095:92a0c2200e41
14 date: Mon Jan 12 13:46:40 1970 +0000 14 date: Mon Jan 12 13:46:40 1970 +0000
15 summary: 1 15 summary: 1
16 16
17 resolving manifests 17 resolving manifests
18 overwrite False branchmerge False partial False linear True 18 overwrite False branchmerge False partial False linear True
19 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 19 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b
20 a versions differ, resolve 20 a versions differ, resolve
21 remote created b 21 remote created b
22 merging a 22 merging a
23 resolving a 23 resolving a
24 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 24 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
30 date: Mon Jan 12 13:46:40 1970 +0000 30 date: Mon Jan 12 13:46:40 1970 +0000
31 summary: 2 31 summary: 2
32 32
33 resolving manifests 33 resolving manifests
34 overwrite False branchmerge False partial False linear True 34 overwrite False branchmerge False partial False linear True
35 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c 35 ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b
36 remote deleted b 36 remote deleted b
37 removing b 37 removing b
38 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 38 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
39 changeset: 0:33aaa84a386b 39 changeset: 0:33aaa84a386b
40 user: test 40 user: test
48 date: Mon Jan 12 13:46:40 1970 +0000 48 date: Mon Jan 12 13:46:40 1970 +0000
49 summary: 1 49 summary: 1
50 50
51 resolving manifests 51 resolving manifests
52 overwrite False branchmerge False partial False linear True 52 overwrite False branchmerge False partial False linear True
53 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 53 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b
54 a versions differ, resolve 54 a versions differ, resolve
55 remote created b 55 remote created b
56 merging a 56 merging a
57 resolving a 57 resolving a
58 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 58 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
99 failed 99 failed
100 abort: outstanding uncommitted changes 100 abort: outstanding uncommitted changes
101 failed 101 failed
102 resolving manifests 102 resolving manifests
103 overwrite False branchmerge True partial False linear False 103 overwrite False branchmerge True partial False linear False
104 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 104 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b
105 a versions differ, resolve 105 a versions differ, resolve
106 b versions differ, resolve 106 b versions differ, resolve
107 merging a 107 merging a
108 resolving a 108 resolving a
109 file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2 109 file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2