165 large1: No such file or directory |
165 large1: No such file or directory |
166 $ hg status -A largeX |
166 $ hg status -A largeX |
167 C largeX |
167 C largeX |
168 $ hg strip -q 5 |
168 $ hg strip -q 5 |
169 |
169 |
|
170 Test that linear merge can detect modification (and conflict) correctly |
|
171 |
|
172 (linear merge without conflict) |
|
173 |
|
174 $ echo 'large2 for linear merge (no conflict)' > large2 |
|
175 $ hg update 3 --config debug.dirstate.delaywrite=2 |
|
176 getting changed largefiles |
|
177 1 largefiles updated, 0 removed |
|
178 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
179 $ hg status -A large2 |
|
180 M large2 |
|
181 $ cat large2 |
|
182 large2 for linear merge (no conflict) |
|
183 $ cat .hglf/large2 |
|
184 9c4bf8f1b33536d6e5f89447e10620cfe52ea710 |
|
185 |
|
186 (linear merge with conflict, choosing "other") |
|
187 |
|
188 $ hg update -q -C 2 |
|
189 $ echo 'large1 for linear merge (conflict)' > large1 |
|
190 $ hg update 3 --config ui.interactive=True <<EOF |
|
191 > o |
|
192 > EOF |
|
193 largefile large1 has a merge conflict |
|
194 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
195 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
|
196 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? getting changed largefiles |
|
197 1 largefiles updated, 0 removed |
|
198 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
199 $ hg status -A large1 |
|
200 C large1 |
|
201 $ cat large1 |
|
202 large1 in #3 |
|
203 $ cat .hglf/large1 |
|
204 e5bb990443d6a92aaf7223813720f7566c9dd05b |
|
205 |
|
206 (linear merge with conflict, choosing "local") |
|
207 |
|
208 $ hg update -q -C 2 |
|
209 $ echo 'large1 for linear merge (conflict)' > large1 |
|
210 $ hg update 3 --config debug.dirstate.delaywrite=2 |
|
211 largefile large1 has a merge conflict |
|
212 ancestor was 4669e532d5b2c093a78eca010077e708a071bb64 |
|
213 keep (l)ocal ba94c2efe5b7c5e0af8d189295ce00553b0612b7 or |
|
214 take (o)ther e5bb990443d6a92aaf7223813720f7566c9dd05b? l |
|
215 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
216 $ hg status -A large1 |
|
217 M large1 |
|
218 $ cat large1 |
|
219 large1 for linear merge (conflict) |
|
220 $ cat .hglf/large1 |
|
221 ba94c2efe5b7c5e0af8d189295ce00553b0612b7 |
|
222 |
170 $ cd .. |
223 $ cd .. |