Mercurial > hg
comparison tests/test-merge-criss-cross.t @ 30855:72c36a2be2d6 stable
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Prepare for adding a test case with files in a directory.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 31 Jan 2017 03:20:07 +0100 |
parents | 6b1fc09c699a |
children | 41f6af50c0d8 |
comparison
equal
deleted
inserted
replaced
30854:0126e422450e | 30855:72c36a2be2d6 |
---|---|
91 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 | 91 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
92 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | 92 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
93 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 93 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
94 [1] | 94 [1] |
95 | 95 |
96 $ head * | 96 $ f --dump * |
97 ==> f1 <== | 97 f1: |
98 >>> | |
98 5 second change | 99 5 second change |
99 | 100 <<< |
100 ==> f2 <== | 101 f2: |
101 6 second change | 102 >>> |
102 | 103 6 second change |
103 ==> f2.base <== | 104 <<< |
105 f2.base: | |
106 >>> | |
104 0 base | 107 0 base |
105 | 108 <<< |
106 ==> f2.local <== | 109 f2.local: |
107 6 second change | 110 >>> |
108 | 111 6 second change |
109 ==> f2.orig <== | 112 <<< |
110 6 second change | 113 f2.orig: |
111 | 114 >>> |
112 ==> f2.other <== | 115 6 second change |
116 <<< | |
117 f2.other: | |
118 >>> | |
113 2 first change | 119 2 first change |
120 <<< | |
114 | 121 |
115 $ hg up -qC . | 122 $ hg up -qC . |
116 $ hg merge -v --tool internal:dump 5 --config merge.preferancestor="null 40663881 3b08d" | 123 $ hg merge -v --tool internal:dump 5 --config merge.preferancestor="null 40663881 3b08d" |
117 note: using 40663881a6dd as ancestor of 3b08d01b0ab5 and adfe50279922 | 124 note: using 40663881a6dd as ancestor of 3b08d01b0ab5 and adfe50279922 |
118 alternatively, use --config merge.preferancestor=0f6b37dbe527 | 125 alternatively, use --config merge.preferancestor=0f6b37dbe527 |
154 getting f1 | 161 getting f1 |
155 f2: remote unchanged -> k | 162 f2: remote unchanged -> k |
156 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 163 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
157 (branch merge, don't forget to commit) | 164 (branch merge, don't forget to commit) |
158 | 165 |
159 $ head * | 166 $ f --dump * |
160 ==> f1 <== | 167 f1: |
168 >>> | |
161 5 second change | 169 5 second change |
162 | 170 <<< |
163 ==> f2 <== | 171 f2: |
164 6 second change | 172 >>> |
173 6 second change | |
174 <<< | |
165 | 175 |
166 | 176 |
167 The other way around: | 177 The other way around: |
168 | 178 |
169 $ hg up -C -r5 | 179 $ hg up -C -r5 |
196 getting f2 | 206 getting f2 |
197 f1: remote unchanged -> k | 207 f1: remote unchanged -> k |
198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 208 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
199 (branch merge, don't forget to commit) | 209 (branch merge, don't forget to commit) |
200 | 210 |
201 $ head * | 211 $ f --dump * |
202 ==> f1 <== | 212 f1: |
213 >>> | |
203 5 second change | 214 5 second change |
204 | 215 <<< |
205 ==> f2 <== | 216 f2: |
206 6 second change | 217 >>> |
218 6 second change | |
219 <<< | |
207 | 220 |
208 Verify how the output looks and and how verbose it is: | 221 Verify how the output looks and and how verbose it is: |
209 | 222 |
210 $ hg up -qC | 223 $ hg up -qC |
211 $ hg merge | 224 $ hg merge |