test-pull-update.t
248 lines
| 6.1 KiB
| text/troff
|
Tads3Lexer
/ tests / test-pull-update.t
|
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 | ||||
|
r31167 | Should respect config to disable dirty update | ||
$ hg co -qC 0 | ||||
$ echo 2 > foo | ||||
|
r34706 | $ hg --config commands.update.check=abort pull -u ../tt | ||
|
r31167 | pulling from ../tt | ||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
r34662 | new changesets 107cefe13e42 | ||
|
r38268 | 1 local changesets published | ||
|
r31167 | abort: uncommitted changes | ||
[255] | ||||
$ hg --config extensions.strip= strip --no-backup tip | ||||
$ hg co -qC tip | ||||
|
r28065 | Should not update to the other topological branch: | ||
|
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) | ||||
|
r34662 | new changesets 107cefe13e42 | ||
|
r28065 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r32698 | updated to "800c91d5bfc1: m" | ||
|
r28065 | 1 other heads for branch "default" | ||
|
r12279 | |||
$ cd ../tt | ||||
|
r28065 | Should not update to the other branch: | ||
|
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) | ||||
|
r34662 | new changesets 800c91d5bfc1 | ||
|
r38268 | 1 local changesets published | ||
|
r28065 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r32698 | updated to "107cefe13e42: m" | ||
|
r28065 | 1 other heads for branch "default" | ||
|
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) | ||||
|
r34662 | new changesets 483b76ad4309 | ||
|
r38268 | 1 local changesets published | ||
|
r12279 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
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 | ||||
|
r35394 | pulling from $TESTTMP/t | ||
|
r28273 | 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 | ||||
|
r34662 | new changesets f815b3da6163 | ||
|
r38268 | 1 local changesets published | ||
|
r28273 | 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 | ||||
|
r35394 | pulling from $TESTTMP/t | ||
|
r28273 | 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 | ||||
|
r34662 | new changesets f815b3da6163 | ||
|
r38268 | 1 local changesets published | ||
|
r28273 | 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 | ||||
|
r28274 | (discard pulled changes) | ||
$ hg update -q 483b76ad4309 | ||||
$ hg rollback -q | ||||
Test that updating deactivates current active bookmark, if the | ||||
destination of the update is explicitly specified, and it doesn't | ||||
|
r30332 | match with the name of any existing bookmarks. | ||
|
r28274 | |||
$ cd ../t | ||||
$ hg bookmark -d active-after-pull | ||||
$ hg branch bar -q | ||||
$ hg commit -m "#5 (bar #1)" | ||||
$ cd ../tt | ||||
(1) deactivating by --rev REV | ||||
$ hg bookmark -f active-before-pull | ||||
$ hg bookmarks | ||||
* active-before-pull 3:483b76ad4309 | ||||
$ hg pull -u -r b5e4babfaaa7 | ||||
|
r35394 | pulling from $TESTTMP/t | ||
|
r28274 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 1 changes to 1 files | ||||
|
r34662 | new changesets f815b3da6163:b5e4babfaaa7 | ||
|
r38268 | 1 local changesets published | ||
|
r28274 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(leaving bookmark active-before-pull) | ||||
$ hg parents -q | ||||
5:b5e4babfaaa7 | ||||
$ hg bookmarks | ||||
active-before-pull 3:483b76ad4309 | ||||
(discard pulled changes) | ||||
$ hg update -q 483b76ad4309 | ||||
$ hg rollback -q | ||||
(2) deactivating by --branch BRANCH | ||||
$ hg bookmark -f active-before-pull | ||||
$ hg bookmarks | ||||
* active-before-pull 3:483b76ad4309 | ||||
$ hg pull -u -b bar | ||||
|
r35394 | pulling from $TESTTMP/t | ||
|
r28274 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 1 changes to 1 files | ||||
|
r34662 | new changesets f815b3da6163:b5e4babfaaa7 | ||
|
r38268 | 1 local changesets published | ||
|
r28274 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(leaving bookmark active-before-pull) | ||||
$ hg parents -q | ||||
5:b5e4babfaaa7 | ||||
$ hg bookmarks | ||||
active-before-pull 3:483b76ad4309 | ||||
(discard pulled changes) | ||||
$ hg update -q 483b76ad4309 | ||||
$ hg rollback -q | ||||
(3) deactivating by URL#ANOTHER-BRANCH | ||||
$ hg bookmark -f active-before-pull | ||||
$ hg bookmarks | ||||
* active-before-pull 3:483b76ad4309 | ||||
$ hg pull -u $TESTTMP/t#bar | ||||
|
r35394 | pulling from $TESTTMP/t | ||
|
r28274 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 1 changes to 1 files | ||||
|
r34662 | new changesets f815b3da6163:b5e4babfaaa7 | ||
|
r38268 | 1 local changesets published | ||
|
r28274 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
(leaving bookmark active-before-pull) | ||||
$ hg parents -q | ||||
5:b5e4babfaaa7 | ||||
$ hg bookmarks | ||||
active-before-pull 3:483b76ad4309 | ||||
|
r16913 | $ cd .. | ||