test-pull-update.t
126 lines
| 3.1 KiB
| text/troff
|
Tads3Lexer
/ tests / test-pull-update.t
Adrian Buehlmann
|
r12279 | $ hg init t | ||
$ cd t | ||||
$ echo 1 > foo | ||||
$ hg ci -Am m | ||||
adding foo | ||||
$ cd .. | ||||
$ hg clone t tt | ||||
updating to branch default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd tt | ||||
$ echo 1.1 > foo | ||||
$ hg ci -Am m | ||||
$ cd ../t | ||||
$ echo 1.2 > foo | ||||
$ hg ci -Am m | ||||
Pierre-Yves David
|
r28065 | Should not update to the other topological branch: | ||
Adrian Buehlmann
|
r12279 | |||
$ hg pull -u ../tt | ||||
pulling from ../tt | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
Pierre-Yves David
|
r28065 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
1 other heads for branch "default" | ||||
Adrian Buehlmann
|
r12279 | |||
$ cd ../tt | ||||
Pierre-Yves David
|
r28065 | Should not update to the other branch: | ||
Adrian Buehlmann
|
r12279 | |||
$ hg pull -u ../t | ||||
pulling from ../t | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
Pierre-Yves David
|
r28065 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
1 other heads for branch "default" | ||||
Adrian Buehlmann
|
r12279 | |||
$ HGMERGE=true hg merge | ||||
merging foo | ||||
0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg ci -mm | ||||
$ cd ../t | ||||
Should work: | ||||
$ hg pull -u ../tt | ||||
pulling from ../tt | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (-1 heads) | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
FUJIWARA Katsunori
|
r28273 | Similarity between "hg update" and "hg pull -u" in handling bookmark | ||
==================================================================== | ||||
Test that updating activates the bookmark, which matches with the | ||||
explicit destination of the update. | ||||
$ echo 4 >> foo | ||||
$ hg commit -m "#4" | ||||
$ hg bookmark active-after-pull | ||||
$ cd ../tt | ||||
(1) activating by --rev BOOKMARK | ||||
$ hg bookmark -f active-before-pull | ||||
$ hg bookmarks | ||||
* active-before-pull 3:483b76ad4309 | ||||
$ hg pull -u -r active-after-pull | ||||
pulling from $TESTTMP/t (glob) | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
adding remote bookmark active-after-pull | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(activating bookmark active-after-pull) | ||||
$ hg parents -q | ||||
4:f815b3da6163 | ||||
$ hg bookmarks | ||||
* active-after-pull 4:f815b3da6163 | ||||
active-before-pull 3:483b76ad4309 | ||||
(discard pulled changes) | ||||
$ hg update -q 483b76ad4309 | ||||
$ hg rollback -q | ||||
(2) activating by URL#BOOKMARK | ||||
$ hg bookmark -f active-before-pull | ||||
$ hg bookmarks | ||||
* active-before-pull 3:483b76ad4309 | ||||
$ hg pull -u $TESTTMP/t#active-after-pull | ||||
pulling from $TESTTMP/t (glob) | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
adding remote bookmark active-after-pull | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(activating bookmark active-after-pull) | ||||
$ hg parents -q | ||||
4:f815b3da6163 | ||||
$ hg bookmarks | ||||
* active-after-pull 4:f815b3da6163 | ||||
active-before-pull 3:483b76ad4309 | ||||
Mads Kiilerich
|
r16913 | $ cd .. | ||