Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 3122:2ef0b3aae186

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify actions with helper function
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 21:27:30 -0500
parents 1c1e59aac82a
children 3fd098e0902d
comparison
equal deleted inserted replaced
3121:1c1e59aac82a 3122:2ef0b3aae186
15 summary: 1 15 summary: 1
16 16
17 resolving manifests 17 resolving manifests
18 overwrite False branchmerge False partial False 18 overwrite False branchmerge False partial False
19 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b 19 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b
20 a versions differ, resolve 20 a: versions differ -> m
21 remote created b 21 b: remote created -> g
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
25 getting b 25 getting b
26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
31 summary: 2 31 summary: 2
32 32
33 resolving manifests 33 resolving manifests
34 overwrite False branchmerge False partial False 34 overwrite False branchmerge False partial False
35 ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b 35 ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b
36 remote deleted b, clobbering 36 b: remote deleted -> r
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
41 date: Mon Jan 12 13:46:40 1970 +0000 41 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 52 overwrite False branchmerge False partial False
53 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b 53 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b
54 a versions differ, resolve 54 a: versions differ -> m
55 remote created b 55 b: remote created -> g
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
59 getting b 59 getting b
60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 60 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
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 103 overwrite False branchmerge True partial False
104 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b 104 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b
105 a versions differ, resolve 105 a: versions differ -> m
106 b versions differ, resolve 106 b: versions differ -> m
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
110 merging b 110 merging b
111 resolving b 111 resolving b