test-rebase-newancestor.t
55 lines
| 688 B
| text/troff
|
Tads3Lexer
/ tests / test-rebase-newancestor.t
Adrian Buehlmann
|
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
|
r12640 | saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) | ||
Adrian Buehlmann
|
r12608 | |||
$ hg tglog | ||||
Pierre-Yves David
|
r19925 | o 3: 'C' | ||
Adrian Buehlmann
|
r12608 | | | ||
o 2: 'B' | ||||
| | ||||
Pierre-Yves David
|
r19925 | @ 1: 'AD' | ||
Adrian Buehlmann
|
r12608 | | | ||
o 0: 'A' | ||||
Mads Kiilerich
|
r16913 | |||
$ cd .. | ||||