##// END OF EJS Templates
merge: fix --preview to show all nodes that will be merged (issue2043)....
merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().

File last commit:

r10455:40dfd46d default
r10505:b3311e26 stable
Show More
test-hgrc.out
24 lines | 726 B | text/plain | TextLexer
Martin Geisler
test-hgrc: cleanup...
r10043 hg: config error at $HGRCPATH:1: 'invalid'
Adrian Buehlmann
hg.clone: report branch name on update
r9611 updating to branch default
Benoit Boissinot
Escape '%' when writing to hgrc (issue1199)...
r7044 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
[paths]
Matt Mackall
clone: config escaping no longer needed
r8179 default = .../foo%bar
default = .../foo%bar
Benoit Boissinot
Escape '%' when writing to hgrc (issue1199)...
r7044 bundle.mainreporoot=.../foobar
Matt Mackall
clone: config escaping no longer needed
r8179 paths.default=.../foo%bar
Martin Geisler
test-hgrc: cleanup...
r10043 hg: config error at $HGRCPATH:2: ' x = y'
Matt Mackall
config: handle short continuations (issue1999)...
r10295 foo.bar=a\nb\nc\nde\nfg
foo.baz=bif cb
Martin Geisler
config: raise ConfigError on non-existing include files...
r10042 hg: config error at $HGRCPATH:1: cannot include /no-such-file (No such file or directory)
Brodie Rao
ui: add HGPLAIN environment variable for easier scripting...
r10455 % customized hgrc
.../.hgrc:8: defaults.identify=-n
.../.hgrc:2: ui.debug=true
.../.hgrc:3: ui.fallbackencoding=ASCII
.../.hgrc:4: ui.quiet=true
.../.hgrc:5: ui.traceback=true
.../.hgrc:6: ui.verbose=true
% plain hgrc
none: ui.traceback=True
none: ui.verbose=False
none: ui.debug=True
none: ui.quiet=False