##// END OF EJS Templates
ancestor.missingancestors: turn into a state-keeping class...
ancestor.missingancestors: turn into a state-keeping class This allows multiple efficient missing ancestor queries against the same set of bases. In upcoming patches we'll also define ways to grow the set of bases. The fact that the test output hasn't changed establishes this patch's correctness.

File last commit:

r20117:aa9385f9 default
r23334:59e6e5dd default
Show More
test-rebase-newancestor.t
55 lines | 688 B | text/troff | Tads3Lexer
/ tests / test-rebase-newancestor.t
Adrian Buehlmann
tests: unify test-rebase*
r12608 $ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
>
> [alias]
> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
> EOF
$ hg init repo
$ cd repo
$ echo A > a
$ echo >> a
$ hg ci -Am A
adding a
$ echo B > a
$ echo >> a
$ hg ci -m B
$ echo C > a
$ echo >> a
$ hg ci -m C
$ hg up -q -C 0
$ echo D >> a
$ hg ci -Am AD
created new head
$ hg tglog
@ 3: 'AD'
|
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase -s 1 -d 3
merging a
merging a
Mads Kiilerich
tests: remove redundant globs...
r12640 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob)
Adrian Buehlmann
tests: unify test-rebase*
r12608
$ hg tglog
Pierre-Yves David
rebase: preserve working directory parent (BC)...
r19925 o 3: 'C'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
o 2: 'B'
|
Pierre-Yves David
rebase: preserve working directory parent (BC)...
r19925 @ 1: 'AD'
Adrian Buehlmann
tests: unify test-rebase*
r12608 |
o 0: 'A'
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..