Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 3111:40e777bda455

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove linear variable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 17:13:02 -0500
parents 92a0c2200e41
children 1c1e59aac82a
comparison
equal deleted inserted replaced
3110:62044d161470 3111:40e777bda455
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 linear True 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, resolve
21 remote created b 21 remote created b
22 merging a 22 merging a
23 resolving a 23 resolving a
29 user: test 29 user: test
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
35 ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b 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
47 user: test 47 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
53 ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b 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
98 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes 98 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
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
104 ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b 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