Mercurial > hg
comparison tests/test-annotate.t @ 42260:d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
test-annotate.t and test-fastannotate.hg were failing with --pure
since 57203e0210f8 (copies: calculate mergecopies() based on
pathcopies(), 2019-04-11). It turned out to be because the pure file
merge code behaved differently. I'm guessing it's the
mdiff.get_matching_blocks() that behaves differently, but I haven't
confirmed that.
With this content in the base:
a
a
a
And this on the local side:
a
z
a
And this on the other side:
a
a
a
b4
c
b6
It produced this conflict:
a
z
a
<<<<<<< working copy: b80e3e32f75a - test: c
||||||| base
a
=======
a
b4
c
b5
>>>>>>> merge rev: 64afcdf8e29e - test: mergeb
I don't care enough about the pure Python code to fix it, so this
patch just updates the tests to manually resolve the conflict.
Differential Revision: https://phab.mercurial-scm.org/D6351
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 06 May 2019 22:06:23 -0700 |
parents | 57203e0210f8 |
children | 509f5b6c0b7e |
comparison
equal
deleted
inserted
replaced
42259:d1c7446d0c58 | 42260:d5b35d6972a5 |
---|---|
271 > z | 271 > z |
272 > a | 272 > a |
273 > EOF | 273 > EOF |
274 $ hg ci -mc -d '3 0' | 274 $ hg ci -mc -d '3 0' |
275 created new head | 275 created new head |
276 Work around the pure version not resolving the conflict like native code | |
277 #if pure | |
278 $ hg merge | |
279 merging b | |
280 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
281 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
282 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
283 [1] | |
284 $ cat <<EOF > b | |
285 > a | |
286 > z | |
287 > a | |
288 > b4 | |
289 > c | |
290 > b5 | |
291 > EOF | |
292 $ hg resolve -m b | |
293 (no more unresolved files) | |
294 $ rm b.orig | |
295 #else | |
276 $ hg merge | 296 $ hg merge |
277 merging b | 297 merging b |
278 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 298 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
279 (branch merge, don't forget to commit) | 299 (branch merge, don't forget to commit) |
300 #endif | |
280 $ echo d >> b | 301 $ echo d >> b |
281 $ hg ci -mmerge2 -d '4 0' | 302 $ hg ci -mmerge2 -d '4 0' |
282 | 303 |
283 annotate after rename merge | 304 annotate after rename merge |
284 | 305 |