Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 3320:b16456909a0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: various tidying update tests to handle corrected output and new workingctx display
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 02:15:20 -0500
parents 966632304dde
children d2b55e3c4e25
comparison
equal deleted inserted replaced
3319:6c68bc1e7873 3320:b16456909a0a
13 user: test 13 user: test
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 18 overwrite False partial False
19 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b 19 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
20 a: versions differ -> m 20 a: versions differ -> m
21 b: remote created -> g 21 b: remote created -> g
22 merging a 22 merging a
23 my a@. other a@802f095af299 ancestor a@33aaa84a386b 23 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
24 getting b 24 getting b
25 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 25 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
26 changeset: 1:802f095af299 26 changeset: 1:802f095af299
27 tag: tip 27 tag: tip
28 user: test 28 user: test
29 date: Mon Jan 12 13:46:40 1970 +0000 29 date: Mon Jan 12 13:46:40 1970 +0000
30 summary: 2 30 summary: 2
31 31
32 resolving manifests 32 resolving manifests
33 overwrite False branchmerge False partial False 33 overwrite False partial False
34 ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b 34 ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b
35 b: remote deleted -> r 35 b: remote deleted -> r
36 removing b 36 removing b
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 changeset: 0:33aaa84a386b 38 changeset: 0:33aaa84a386b
39 user: test 39 user: test
46 user: test 46 user: test
47 date: Mon Jan 12 13:46:40 1970 +0000 47 date: Mon Jan 12 13:46:40 1970 +0000
48 summary: 1 48 summary: 1
49 49
50 resolving manifests 50 resolving manifests
51 overwrite False branchmerge False partial False 51 overwrite False partial False
52 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b 52 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
53 a: versions differ -> m 53 a: versions differ -> m
54 b: remote created -> g 54 b: remote created -> g
55 merging a 55 merging a
56 my a@. other a@802f095af299 ancestor a@33aaa84a386b 56 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
57 getting b 57 getting b
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59 changeset: 1:802f095af299 59 changeset: 1:802f095af299
60 tag: tip 60 tag: tip
61 user: test 61 user: test
96 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes 96 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
97 failed 97 failed
98 abort: outstanding uncommitted changes 98 abort: outstanding uncommitted changes
99 failed 99 failed
100 resolving manifests 100 resolving manifests
101 overwrite False branchmerge True partial False 101 overwrite False partial False
102 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b 102 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
103 a: versions differ -> m 103 a: versions differ -> m
104 b: versions differ -> m 104 b: versions differ -> m
105 merging a 105 merging a
106 my a@. other a@030602aee63d ancestor a@33aaa84a386b 106 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
107 merging b 107 merging b
108 my b@. other b@030602aee63d ancestor b@000000000000 108 my b@802f095af299+ other b@030602aee63d ancestor b@000000000000
109 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 109 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
110 (branch merge, don't forget to commit) 110 (branch merge, don't forget to commit)
111 changeset: 1:802f095af299 111 changeset: 1:802f095af299
112 user: test 112 user: test
113 date: Mon Jan 12 13:46:40 1970 +0000 113 date: Mon Jan 12 13:46:40 1970 +0000