Mercurial > hg
comparison tests/test-bookmarks-pushpull.t @ 48041:37a41267d000
branching: merge stable into default
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Tue, 28 Sep 2021 09:40:57 +0200 |
| parents | 62f325f9b347 |
| children | 4d2ab365699e |
comparison
equal
deleted
inserted
replaced
| 48040:7970895a21cb | 48041:37a41267d000 |
|---|---|
| 488 @ 1:0d2164f0ce0d | 488 @ 1:0d2164f0ce0d |
| 489 * X 1:0d2164f0ce0d | 489 * X 1:0d2164f0ce0d |
| 490 Y 0:4e3505fd9583 | 490 Y 0:4e3505fd9583 |
| 491 Z 1:0d2164f0ce0d | 491 Z 1:0d2164f0ce0d |
| 492 | 492 |
| 493 mirroring bookmarks | |
| 494 | |
| 495 $ hg book | |
| 496 @ 1:9b140be10808 | |
| 497 @foo 2:0d2164f0ce0d | |
| 498 X 1:9b140be10808 | |
| 499 X@foo 2:0d2164f0ce0d | |
| 500 Y 0:4e3505fd9583 | |
| 501 Z 2:0d2164f0ce0d | |
| 502 foo -1:000000000000 | |
| 503 * foobar 1:9b140be10808 | |
| 504 $ cp .hg/bookmarks .hg/bookmarks.bak | |
| 505 $ hg book -d X | |
| 506 $ hg pull ../a --config bookmarks.mirror=true | |
| 507 pulling from ../a | |
| 508 searching for changes | |
| 509 no changes found | |
| 510 $ hg book | |
| 511 @ 2:0d2164f0ce0d | |
| 512 X 2:0d2164f0ce0d | |
| 513 Y 0:4e3505fd9583 | |
| 514 Z 2:0d2164f0ce0d | |
| 515 $ mv .hg/bookmarks.bak .hg/bookmarks | |
| 516 | |
| 493 explicit pull should overwrite the local version (issue4439) | 517 explicit pull should overwrite the local version (issue4439) |
| 494 | 518 |
| 495 $ hg update -r X | 519 $ hg update -r X |
| 496 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 520 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 497 (activating bookmark X) | 521 (activating bookmark X) |
| 1140 $ cat >> .hg/hgrc << EOF | 1164 $ cat >> .hg/hgrc << EOF |
| 1141 > [paths] | 1165 > [paths] |
| 1142 > local=../issue4455-dest/ | 1166 > local=../issue4455-dest/ |
| 1143 > ssh=ssh://user@dummy/issue4455-dest | 1167 > ssh=ssh://user@dummy/issue4455-dest |
| 1144 > http=http://localhost:$HGPORT/ | 1168 > http=http://localhost:$HGPORT/ |
| 1145 > [ui] | |
| 1146 > ssh="$PYTHON" "$TESTDIR/dummyssh" | |
| 1147 > EOF | 1169 > EOF |
| 1148 $ cat >> ../issue4455-dest/.hg/hgrc << EOF | 1170 $ cat >> ../issue4455-dest/.hg/hgrc << EOF |
| 1149 > [hooks] | 1171 > [hooks] |
| 1150 > prepushkey=false | 1172 > prepushkey=false |
| 1151 > [web] | 1173 > [web] |
| 1268 | 1290 |
| 1269 Test that pre-pushkey compat for bookmark works as expected (issue5777) | 1291 Test that pre-pushkey compat for bookmark works as expected (issue5777) |
| 1270 | 1292 |
| 1271 $ cat << EOF >> $HGRCPATH | 1293 $ cat << EOF >> $HGRCPATH |
| 1272 > [ui] | 1294 > [ui] |
| 1273 > ssh="$PYTHON" "$TESTDIR/dummyssh" | |
| 1274 > [server] | 1295 > [server] |
| 1275 > bookmarks-pushkey-compat = yes | 1296 > bookmarks-pushkey-compat = yes |
| 1276 > EOF | 1297 > EOF |
| 1277 | 1298 |
| 1278 $ hg init server | 1299 $ hg init server |