mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +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.
38 lines
752 B
Perl
38 lines
752 B
Perl
$ hg init base
|
|
|
|
$ cd base
|
|
$ echo 'alpha' > alpha
|
|
$ hg ci -A -m 'add alpha'
|
|
adding alpha
|
|
$ cd ..
|
|
|
|
$ hg clone base work
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd work
|
|
$ echo 'beta' > beta
|
|
$ hg ci -A -m 'add beta'
|
|
adding beta
|
|
$ cd ..
|
|
|
|
$ cd base
|
|
$ echo 'gamma' > gamma
|
|
$ hg ci -A -m 'add gamma'
|
|
adding gamma
|
|
$ cd ..
|
|
|
|
$ cd work
|
|
$ hg pull -q
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
Update --clean to revision 1 to simulate a failed merge:
|
|
|
|
$ rm alpha beta gamma
|
|
$ hg update --clean 1
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd ..
|