##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

changectx: ancestor should only prefer merge.preferancestor if it is a revision...
changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.
Mads Kiilerich - - Load All Authors

File last commit:

r21025:54af51c1 default
r22180:17011b36 stable
Show More
test-demandimport.py.out
16 lines | 551 B | text/plain | TextLexer
/ tests / test-demandimport.py.out
History | Annotation | Raw |Copy content |Copy permalink
os = <unloaded module 'os'>
os.system = <built-in function system>
os = <module 'os' from '?'>
util = <unloaded module 'util'>
util.system = <function system at 0x?>
util = <module 'mercurial.util' from '?'>
util.system = <function system at 0x?>
fred = <unloaded module 're'>
re = <unloaded module 'sys'>
fred = <unloaded module 're'>
fred.sub = <function sub at 0x?>
fred = <proxied module 're'>
re = <unloaded module 'sys'>
re.stderr = <open file '<whatever>', mode 'w' at 0x?>
re = <proxied module 'sys'>
node = <module 'mercurial.node' from '?'>