Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-up-local-change.out @ 2956:6dddcba7596a
merge.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 18 Aug 2006 21:17:28 -0700 |
parents | 9d1c3529ebbc 013921c753bd |
children | fb493241d7f6 |
comparison
equal
deleted
inserted
replaced
2955:9d1c3529ebbc | 2956:6dddcba7596a |
---|---|
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 force None allow None moddirstate True linear True | 18 overwrite False branchmerge False partial False linear True |
19 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | 19 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
20 a versions differ, resolve | 20 a versions differ, resolve |
21 remote created b | 21 remote created b |
22 getting b | 22 getting b |
23 merging a | 23 merging 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 force None allow None moddirstate True linear True | 34 overwrite False branchmerge False partial False linear True |
35 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c | 35 ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c |
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 |
41 date: Mon Jan 12 13:46:40 1970 +0000 | 41 date: Mon Jan 12 13:46:40 1970 +0000 |
42 summary: 1 | 42 summary: 1 |
43 | 43 |
44 abort: there is nothing to merge, just use 'hg update' or look at 'hg heads' | 44 abort: there is nothing to merge - use "hg update" instead |
45 failed | 45 failed |
46 changeset: 0:33aaa84a386b | 46 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 force None allow None moddirstate True linear True | 52 overwrite False branchmerge False partial False linear True |
53 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | 53 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
54 a versions differ, resolve | 54 a versions differ, resolve |
55 remote created b | 55 remote created b |
56 getting b | 56 getting b |
57 merging a | 57 merging a |
93 changeset: 1:802f095af299 | 93 changeset: 1:802f095af299 |
94 user: test | 94 user: test |
95 date: Mon Jan 12 13:46:40 1970 +0000 | 95 date: Mon Jan 12 13:46:40 1970 +0000 |
96 summary: 2 | 96 summary: 2 |
97 | 97 |
98 resolving manifests | 98 abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
99 force None allow None moddirstate True linear False | |
100 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 | |
101 a versions differ, resolve | |
102 b versions differ, resolve | |
103 this update spans a branch affecting the following files: | |
104 a (resolve) | |
105 b (resolve) | |
106 aborting update spanning branches! | |
107 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) | |
108 failed | 99 failed |
109 abort: outstanding uncommitted changes | 100 abort: outstanding uncommitted changes |
110 failed | 101 failed |
111 resolving manifests | 102 resolving manifests |
112 force False allow True moddirstate True linear False | 103 overwrite False branchmerge True partial False linear False |
113 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 | 104 ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 |
114 a versions differ, resolve | 105 a versions differ, resolve |
115 b versions differ, resolve | 106 b versions differ, resolve |
116 merging a | 107 merging a |
117 resolving a | 108 resolving a |