mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
02d6c96efe
The --update is unrelated to the test and has no effect as it fails anyway. Dropping it reduces the noise in the coming change in default destination for update.
42 lines
1.1 KiB
Perl
42 lines
1.1 KiB
Perl
https://bz.mercurial-scm.org/1502
|
|
|
|
Initialize repository
|
|
|
|
$ hg init foo
|
|
$ touch foo/a && hg -R foo commit -A -m "added a"
|
|
adding a
|
|
|
|
$ hg clone foo foo1
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
|
|
$ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
|
|
$ hg -R foo1 pull
|
|
pulling from $TESTTMP/foo (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
$ hg -R foo1 book branchy
|
|
$ hg -R foo1 book
|
|
* branchy 1:e3e522925eff
|
|
|
|
Pull. Bookmark should not jump to new head.
|
|
|
|
$ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
|
|
$ hg -R foo1 pull
|
|
pulling from $TESTTMP/foo (glob)
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hg -R foo1 book
|
|
* branchy 1:e3e522925eff
|