2010-10-01 18:10:06 +04:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [extensions]
|
|
|
|
> rebase=
|
|
|
|
>
|
2011-12-27 03:11:22 +04:00
|
|
|
> [phases]
|
|
|
|
> publish=False
|
|
|
|
>
|
2010-10-01 18:10:06 +04:00
|
|
|
> [alias]
|
2017-12-11 08:57:37 +03:00
|
|
|
> tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n"
|
2010-10-01 18:10:06 +04:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
|
|
|
|
$ hg init a
|
|
|
|
$ cd a
|
|
|
|
|
|
|
|
$ echo c1 > c1
|
|
|
|
$ hg ci -Am c1
|
|
|
|
adding c1
|
|
|
|
|
|
|
|
$ echo c2 > c2
|
|
|
|
$ hg ci -Am c2
|
|
|
|
adding c2
|
|
|
|
|
|
|
|
$ echo l1 > l1
|
|
|
|
$ hg ci -Am l1
|
|
|
|
adding l1
|
|
|
|
|
|
|
|
$ hg up -q -C 1
|
|
|
|
|
|
|
|
$ echo r1 > r1
|
|
|
|
$ hg ci -Am r1
|
|
|
|
adding r1
|
|
|
|
|
|
|
|
$ echo r2 > r2
|
|
|
|
$ hg ci -Am r2
|
|
|
|
adding r2
|
|
|
|
|
|
|
|
$ hg tglog
|
2017-12-11 08:57:37 +03:00
|
|
|
@ 4: 225af64d03e6 'r2'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 3: 8d0a8c99b309 'r1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
| o 2: 87c180a611f2 'l1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|/
|
2017-12-11 08:57:37 +03:00
|
|
|
o 1: 56daeba07f4b 'c2'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 0: e8faad3d03ff 'c1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
|
|
Rebase with no arguments - single revision in source branch:
|
|
|
|
|
|
|
|
$ hg up -q -C 2
|
|
|
|
|
|
|
|
$ hg rebase
|
2014-12-09 05:45:26 +03:00
|
|
|
rebasing 2:87c180a611f2 "l1"
|
2017-12-11 06:50:57 +03:00
|
|
|
saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
|
|
$ hg tglog
|
2017-12-11 08:57:37 +03:00
|
|
|
@ 4: b1152cc99655 'l1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 3: 225af64d03e6 'r2'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 2: 8d0a8c99b309 'r1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 1: 56daeba07f4b 'c2'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 0: e8faad3d03ff 'c1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
|
|
|
|
$ hg init b
|
|
|
|
$ cd b
|
|
|
|
|
|
|
|
$ echo c1 > c1
|
|
|
|
$ hg ci -Am c1
|
|
|
|
adding c1
|
|
|
|
|
|
|
|
$ echo c2 > c2
|
|
|
|
$ hg ci -Am c2
|
|
|
|
adding c2
|
|
|
|
|
|
|
|
$ echo l1 > l1
|
|
|
|
$ hg ci -Am l1
|
|
|
|
adding l1
|
|
|
|
|
|
|
|
$ echo l2 > l2
|
|
|
|
$ hg ci -Am l2
|
|
|
|
adding l2
|
|
|
|
|
|
|
|
$ hg up -q -C 1
|
|
|
|
|
|
|
|
$ echo r1 > r1
|
|
|
|
$ hg ci -Am r1
|
|
|
|
adding r1
|
|
|
|
|
|
|
|
$ hg tglog
|
2017-12-11 08:57:37 +03:00
|
|
|
@ 4: 8d0a8c99b309 'r1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
| o 3: 1ac923b736ef 'l2'
|
2010-10-01 18:10:06 +04:00
|
|
|
| |
|
2017-12-11 08:57:37 +03:00
|
|
|
| o 2: 87c180a611f2 'l1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|/
|
2017-12-11 08:57:37 +03:00
|
|
|
o 1: 56daeba07f4b 'c2'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 0: e8faad3d03ff 'c1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
|
|
Rebase with no arguments - single revision in target branch:
|
|
|
|
|
|
|
|
$ hg up -q -C 3
|
|
|
|
|
|
|
|
$ hg rebase
|
2014-12-09 05:45:26 +03:00
|
|
|
rebasing 2:87c180a611f2 "l1"
|
|
|
|
rebasing 3:1ac923b736ef "l2"
|
2017-12-11 06:50:57 +03:00
|
|
|
saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
|
|
$ hg tglog
|
2017-12-11 08:57:37 +03:00
|
|
|
@ 4: 023181307ed0 'l2'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 3: 913ab52b43b4 'l1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 2: 8d0a8c99b309 'r1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 1: 56daeba07f4b 'c2'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
|
2017-12-11 08:57:37 +03:00
|
|
|
o 0: e8faad3d03ff 'c1'
|
2010-10-01 18:10:06 +04:00
|
|
|
|
2012-06-11 03:40:51 +04:00
|
|
|
|
|
|
|
$ cd ..
|