test-rebase-pull.t
211 lines
| 3.6 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-pull.t
|
r12608 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> rebase= | ||||
> | ||||
> [alias] | ||||
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" | ||||
> EOF | ||||
$ hg init a | ||||
$ cd a | ||||
$ echo C1 > C1 | ||||
$ hg ci -Am C1 | ||||
adding C1 | ||||
$ echo C2 > C2 | ||||
$ hg ci -Am C2 | ||||
adding C2 | ||||
$ cd .. | ||||
$ hg clone a b | ||||
updating to branch default | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg clone a c | ||||
updating to branch default | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd b | ||||
$ echo L1 > L1 | ||||
$ hg ci -Am L1 | ||||
adding L1 | ||||
$ cd ../a | ||||
$ echo R1 > R1 | ||||
$ hg ci -Am R1 | ||||
adding R1 | ||||
$ cd ../b | ||||
Now b has one revision to be pulled from a: | ||||
$ hg pull --rebase | ||||
|
r15447 | pulling from $TESTTMP/a (glob) | ||
|
r12608 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r23517 | rebasing 2:ff8d69a621f9 "L1" | ||
|
r23835 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-backup.hg (glob) | ||
|
r12608 | |||
$ hg tglog | ||||
@ 3: 'L1' | ||||
| | ||||
o 2: 'R1' | ||||
| | ||||
o 1: 'C2' | ||||
| | ||||
o 0: 'C1' | ||||
Re-run: | ||||
$ hg pull --rebase | ||||
|
r15447 | pulling from $TESTTMP/a (glob) | ||
|
r12608 | searching for changes | ||
no changes found | ||||
Invoke pull --rebase and nothing to rebase: | ||||
$ cd ../c | ||||
|
r16228 | $ hg book norebase | ||
|
r12608 | $ hg pull --rebase | ||
|
r15447 | pulling from $TESTTMP/a (glob) | ||
|
r12608 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r20249 | nothing to rebase - working directory parent is already an ancestor of destination 77ae9631bcca | ||
|
r12608 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r16228 | updating bookmark norebase | ||
|
r12608 | |||
$ hg tglog -l 1 | ||||
@ 2: 'R1' | ||||
| | ||||
pull --rebase --update should ignore --update: | ||||
$ hg pull --rebase --update | ||||
|
r15447 | pulling from $TESTTMP/a (glob) | ||
|
r12608 | searching for changes | ||
no changes found | ||||
pull --rebase doesn't update if nothing has been pulled: | ||||
$ hg up -q 1 | ||||
$ hg pull --rebase | ||||
|
r15447 | pulling from $TESTTMP/a (glob) | ||
|
r12608 | searching for changes | ||
no changes found | ||||
$ hg tglog -l 1 | ||||
o 2: 'R1' | ||||
| | ||||
|
r16913 | $ cd .. | ||
|
r17988 | |||
pull --rebase works when a specific revision is pulled (issue3619) | ||||
$ cd a | ||||
$ hg tglog | ||||
@ 2: 'R1' | ||||
| | ||||
o 1: 'C2' | ||||
| | ||||
o 0: 'C1' | ||||
$ echo R2 > R2 | ||||
$ hg ci -Am R2 | ||||
adding R2 | ||||
$ echo R3 > R3 | ||||
$ hg ci -Am R3 | ||||
adding R3 | ||||
$ cd ../c | ||||
$ hg tglog | ||||
o 2: 'R1' | ||||
| | ||||
@ 1: 'C2' | ||||
| | ||||
o 0: 'C1' | ||||
$ echo L1 > L1 | ||||
$ hg ci -Am L1 | ||||
adding L1 | ||||
created new head | ||||
$ hg pull --rev tip --rebase | ||||
|
r18108 | pulling from $TESTTMP/a (glob) | ||
|
r17988 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 2 changes to 2 files | ||||
|
r23517 | rebasing 3:ff8d69a621f9 "L1" | ||
|
r23835 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-backup.hg (glob) | ||
|
r17988 | $ hg tglog | ||
@ 5: 'L1' | ||||
| | ||||
o 4: 'R3' | ||||
| | ||||
o 3: 'R2' | ||||
| | ||||
o 2: 'R1' | ||||
| | ||||
o 1: 'C2' | ||||
| | ||||
o 0: 'C1' | ||||
|
r24170 | pull --rebase works with bundle2 turned on | ||
|
r17988 | |||
|
r24170 | $ cd ../a | ||
$ echo R4 > R4 | ||||
$ hg ci -Am R4 | ||||
adding R4 | ||||
$ hg tglog | ||||
@ 5: 'R4' | ||||
| | ||||
o 4: 'R3' | ||||
| | ||||
o 3: 'R2' | ||||
| | ||||
o 2: 'R1' | ||||
| | ||||
o 1: 'C2' | ||||
| | ||||
o 0: 'C1' | ||||
$ cd ../c | ||||
$ hg pull --rebase --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02 | ||||
pulling from $TESTTMP/a (glob) | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
rebasing 5:518d153c0ba3 "L1" | ||||
saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-backup.hg (glob) | ||||
$ hg tglog | ||||
@ 6: 'L1' | ||||
| | ||||
o 5: 'R4' | ||||
| | ||||
o 4: 'R3' | ||||
| | ||||
o 3: 'R2' | ||||
| | ||||
o 2: 'R1' | ||||
| | ||||
o 1: 'C2' | ||||
| | ||||
o 0: 'C1' | ||||