Show More
@@ -558,9 +558,10 b' class changectx(basectx):' | |||
|
558 | 558 | anc = cahs[0] |
|
559 | 559 | else: |
|
560 | 560 | for r in self._repo.ui.configlist('merge', 'preferancestor'): |
|
561 |
|
|
|
561 | try: | |
|
562 | ctx = changectx(self._repo, r) | |
|
563 | except error.RepoLookupError: | |
|
562 | 564 | continue |
|
563 | ctx = changectx(self._repo, r) | |
|
564 | 565 | anc = ctx.node() |
|
565 | 566 | if anc in cahs: |
|
566 | 567 | break |
@@ -349,7 +349,7 b' Verify that the old context ancestor wor' | |||
|
349 | 349 | 2 |
|
350 | 350 | $ hg log -r 'ancestor(head())' --config merge.preferancestor=3 -T '{rev}\n' |
|
351 | 351 | 1 |
|
352 | $ hg log -r 'ancestor(head())' --config merge.preferancestor='*' -T '{rev}\n' | |
|
353 |
|
|
|
352 | $ hg log -r 'ancestor(head())' --config merge.preferancestor='1337 * - 2' -T '{rev}\n' | |
|
353 | 2 | |
|
354 | 354 | |
|
355 | 355 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now