mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
fa1c4e5ebe
Many tests didn't change back from subdirectories at the end of the tests ... and they don't have to. The missing 'cd ..' could always be added when another test case is added to the test file. This change do that tests (99.5%) consistently end up in $TESTDIR where they started, thus making it simpler to extend them or move them around.
129 lines
1.5 KiB
Perl
129 lines
1.5 KiB
Perl
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> graphlog=
|
|
> rebase=
|
|
>
|
|
> [phases]
|
|
> publish=False
|
|
>
|
|
> [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
|
|
|
|
$ echo l1 > l1
|
|
$ hg ci -Am l1
|
|
adding l1
|
|
|
|
$ hg up -q -C 1
|
|
|
|
$ echo r1 > r1
|
|
$ hg ci -Am r1
|
|
adding r1
|
|
created new head
|
|
|
|
$ echo r2 > r2
|
|
$ hg ci -Am r2
|
|
adding r2
|
|
|
|
$ hg tglog
|
|
@ 4: 'r2'
|
|
|
|
|
o 3: 'r1'
|
|
|
|
|
| o 2: 'l1'
|
|
|/
|
|
o 1: 'c2'
|
|
|
|
|
o 0: 'c1'
|
|
|
|
Rebase with no arguments - single revision in source branch:
|
|
|
|
$ hg up -q -C 2
|
|
|
|
$ hg rebase
|
|
saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
|
|
|
|
$ hg tglog
|
|
@ 4: 'l1'
|
|
|
|
|
o 3: 'r2'
|
|
|
|
|
o 2: 'r1'
|
|
|
|
|
o 1: 'c2'
|
|
|
|
|
o 0: 'c1'
|
|
|
|
$ 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
|
|
created new head
|
|
|
|
$ hg tglog
|
|
@ 4: 'r1'
|
|
|
|
|
| o 3: 'l2'
|
|
| |
|
|
| o 2: 'l1'
|
|
|/
|
|
o 1: 'c2'
|
|
|
|
|
o 0: 'c1'
|
|
|
|
Rebase with no arguments - single revision in target branch:
|
|
|
|
$ hg up -q -C 3
|
|
|
|
$ hg rebase
|
|
saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
|
|
|
|
$ hg tglog
|
|
@ 4: 'l2'
|
|
|
|
|
o 3: 'l1'
|
|
|
|
|
o 2: 'r1'
|
|
|
|
|
o 1: 'c2'
|
|
|
|
|
o 0: 'c1'
|
|
|
|
|
|
$ cd ..
|