Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 1674:dee55c4a4963

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
abort when using 'update -m' and this is not a merge add more testcases for updating with local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 01 Feb 2006 08:46:24 +0100
parents 3b1b44b917f4
children 6d50d6189269
comparison
equal deleted inserted replaced
1667:daff3ef0de8d 1674:dee55c4a4963
5 @@ -1,1 +1,1 @@ a 5 @@ -1,1 +1,1 @@ a
6 -a 6 -a
7 +abc 7 +abc
8 adding b 8 adding b
9 M a 9 M a
10 changeset: 0:c19d34741b0a
11 user: test
12 date: Thu Jan 1 00:00:00 1970 +0000
13 summary: 1
14
10 resolving manifests 15 resolving manifests
11 force None allow None moddirstate True linear True 16 force None allow None moddirstate True linear True
12 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e 17 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
13 a versions differ, resolve 18 a versions differ, resolve
14 remote created b 19 remote created b
15 getting b 20 getting b
16 merging a 21 merging a
17 resolving a 22 resolving a
18 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 23 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
19 abort: outstanding uncommited changes 24 changeset: 1:1e71731e6fbb
25 tag: tip
26 user: test
27 date: Thu Jan 1 00:00:00 1970 +0000
28 summary: 2
29
30 resolving manifests
31 force None allow None moddirstate True linear True
32 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
33 remote deleted b
34 removing b
35 changeset: 0:c19d34741b0a
36 user: test
37 date: Thu Jan 1 00:00:00 1970 +0000
38 summary: 1
39
40 abort: there is nothing to merge, just use 'hg update'
20 failed 41 failed
42 changeset: 0:c19d34741b0a
43 user: test
44 date: Thu Jan 1 00:00:00 1970 +0000
45 summary: 1
46
21 resolving manifests 47 resolving manifests
22 force None allow 1 moddirstate True linear True 48 force None allow None moddirstate True linear True
23 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e 49 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
50 a versions differ, resolve
51 remote created b
52 getting b
53 merging a
54 resolving a
55 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
24 changeset: 1:1e71731e6fbb 56 changeset: 1:1e71731e6fbb
25 tag: tip 57 tag: tip
26 user: test 58 user: test
27 date: Thu Jan 1 00:00:00 1970 +0000 59 date: Thu Jan 1 00:00:00 1970 +0000
28 summary: 2 60 summary: 2
48 --- a/a 80 --- a/a
49 +++ b/a 81 +++ b/a
50 @@ -1,1 +1,1 @@ a2 82 @@ -1,1 +1,1 @@ a2
51 -a2 83 -a2
52 +abc 84 +abc
85 adding b
86 M a
87 changeset: 1:1e71731e6fbb
88 user: test
89 date: Thu Jan 1 00:00:00 1970 +0000
90 summary: 2
91
92 resolving manifests
93 force None allow None moddirstate True linear False
94 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
95 a versions differ, resolve
96 b versions differ, resolve
97 this update spans a branch affecting the following files:
98 a (resolve)
99 b (resolve)
100 aborting update spanning branches!
101 (use update -m to merge across branches or -C to lose changes)
102 failed
103 abort: outstanding uncommited changes
104 failed
105 resolving manifests
106 force None allow 1 moddirstate True linear False
107 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
108 a versions differ, resolve
109 b versions differ, resolve
110 merging a
111 resolving a
112 file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2
113 merging b
114 resolving b
115 file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
116 changeset: 1:1e71731e6fbb
117 user: test
118 date: Thu Jan 1 00:00:00 1970 +0000
119 summary: 2
120
121 changeset: 2:83c51d0caff4
122 tag: tip
123 parent: 0:c19d34741b0a
124 user: test
125 date: Thu Jan 1 00:00:00 1970 +0000
126 summary: 3
127
128 diff -r 1e71731e6fbb a
129 --- a/a
130 +++ b/a
131 @@ -1,1 +1,1 @@ a2
132 -a2
133 +abc