| baymax |
| hg-reviewers |
| Lint Skipped |
| Unit Tests Skipped |
There seems to have been no activities on this Diff for the past 3 Months.
By policy, we are automatically moving it out of the need-review state.
Please, move it back to need-review without hesitation if this diff should still be discussed.
:baymax:need-review-idle:
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/exchange.py (7 lines) | |||
| M | tests/test-bookflow.t (4 lines) | |||
| A | M | tests/test-bookmarks-conflict.t (90 lines) | ||
| M | tests/test-bookmarks-pushpull.t (7 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| a64e009e8b37 | 34ed651ba7e4 | Valentin Gatien-Baron | Sep 12 2019, 10:30 PM |
| for b, scid, dcid in addsrc: | for b, scid, dcid in addsrc: | ||||
| if b in explicit: | if b in explicit: | ||||
| explicit.remove(b) | explicit.remove(b) | ||||
| pushop.outbookmarks.append((b, '', scid)) | pushop.outbookmarks.append((b, '', scid)) | ||||
| # search for overwritten bookmark | # search for overwritten bookmark | ||||
| for b, scid, dcid in list(advdst) + list(diverge) + list(differ): | for b, scid, dcid in list(advdst) + list(diverge) + list(differ): | ||||
| if b in explicit: | if b in explicit: | ||||
| explicit.remove(b) | explicit.remove(b) | ||||
| if pushop.force: | |||||
| pushop.outbookmarks.append((b, dcid, scid)) | pushop.outbookmarks.append((b, dcid, scid)) | ||||
| else: | |||||
| msg = _('push rejected: bookmark "%s" has changed') % b | |||||
| hint = _("run 'hg pull', resolve conflicts, and push again") | |||||
| raise error.Abort(msg, hint=hint) | |||||
| # search for bookmark to delete | # search for bookmark to delete | ||||
| for b, scid, dcid in adddst: | for b, scid, dcid in adddst: | ||||
| if b in explicit: | if b in explicit: | ||||
| explicit.remove(b) | explicit.remove(b) | ||||
| # treat as "deleted locally" | # treat as "deleted locally" | ||||
| pushop.outbookmarks.append((b, dcid, '')) | pushop.outbookmarks.append((b, dcid, '')) | ||||
| # identical bookmarks shouldn't get reported | # identical bookmarks shouldn't get reported | ||||
| for b, scid, dcid in same: | for b, scid, dcid in same: | ||||
| $ hg -R ../a bookmarks | $ hg -R ../a bookmarks | ||||
| * X 4:238292f60a57 | * X 4:238292f60a57 | ||||
| $ hg -R ../b bookmarks | $ hg -R ../b bookmarks | ||||
| @ 3:* (glob) | @ 3:* (glob) | ||||
| * X 5:096f7e86892d | * X 5:096f7e86892d | ||||
| $ cd ../b | $ cd ../b | ||||
| $ # make sure we cannot push after bookmarks diverged | $ # make sure we cannot push after bookmarks diverged | ||||
| $ hg push -B X | grep abort | $ hg push -B X | grep abort | ||||
| abort: push creates new remote head * with bookmark 'X'! (glob) | abort: push rejected: bookmark "X" has changed | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (run 'hg pull', resolve conflicts, and push again) | ||||
| [1] | [1] | ||||
| $ hg pull -u | grep divergent | $ hg pull -u | grep divergent | ||||
| divergent bookmark X stored as X@default | divergent bookmark X stored as X@default | ||||
| 1 other divergent bookmarks for "X" | 1 other divergent bookmarks for "X" | ||||
| $ hg bookmarks | $ hg bookmarks | ||||
| @ 3:* (glob) | @ 3:* (glob) | ||||
| * X 5:096f7e86892d | * X 5:096f7e86892d | ||||
| X@default 6:238292f60a57 | X@default 6:238292f60a57 | ||||
| initialize | |||||
| $ make_changes() { | |||||
| > d=`pwd` | |||||
| > [ ! -z $1 ] && cd $1 | |||||
| > echo "test `basename \`pwd\``" >> test | |||||
| > hg commit -Am"${2:-test}" | |||||
| > r=$? | |||||
| > cd $d | |||||
| > return $r | |||||
| > } | |||||
| $ ls -1a | |||||
| . | |||||
| .. | |||||
| $ hg init a | |||||
| $ cd a | |||||
| $ echo 'test' > test; hg commit -Am'test' | |||||
| adding test | |||||
| $ hg book @ | |||||
| clone to b | |||||
| $ mkdir ../b | |||||
| $ cd ../b | |||||
| $ hg clone ../a . | |||||
| updating to bookmark @ | |||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| $ make_changes | |||||
| $ hg book bk_b | |||||
| clone to c | |||||
| $ mkdir ../c | |||||
| $ cd ../c | |||||
| $ hg clone ../a . | |||||
| updating to bookmark @ | |||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| $ make_changes | |||||
| $ hg book bk_c | |||||
| push from b | |||||
| $ cd ../b | |||||
| $ hg push -B . | |||||
| pushing to $TESTTMP/a | |||||
| searching for changes | |||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 1 changesets with 1 changes to 1 files | |||||
| updating bookmark @ | |||||
| exporting bookmark bk_b | |||||
| $ hg -R ../a id -r @ | |||||
| e11a942451be tip @/bk_b | |||||
| push from c | |||||
| $ cd ../c | |||||
| $ hg push -B . | |||||
| pushing to $TESTTMP/a | |||||
| searching for changes | |||||
| remote has heads on branch 'default' that are not known locally: e11a942451be | |||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | |||||
| exporting bookmark bk_c | |||||
| $ hg push -B @ | |||||
| pushing to $TESTTMP/a | |||||
| searching for changes | |||||
| abort: push rejected: bookmark "@" has changed | |||||
| (run 'hg pull', resolve conflicts, and push again) | |||||
| [255] | |||||
| $ hg -R ../a log -G -T '{rev} {bookmarks}' | |||||
| o 2 bk_c | |||||
| | | |||||
| | o 1 @ bk_b | |||||
| |/ | |||||
| @ 0 | |||||
| $ hg push -B @ --force | |||||
| pushing to $TESTTMP/a | |||||
| searching for changes | |||||
| no changes found | |||||
| updating bookmark @ | |||||
| [1] | |||||
| $ hg -R ../a log -G -T '{rev} {bookmarks}' | |||||
| o 2 @ bk_c | |||||
| | | |||||
| | o 1 bk_b | |||||
| |/ | |||||
| @ 0 | |||||
| $ hg out -B http://localhost:$HGPORT/ | $ hg out -B http://localhost:$HGPORT/ | ||||
| comparing with http://localhost:$HGPORT/ | comparing with http://localhost:$HGPORT/ | ||||
| searching for changed bookmarks | searching for changed bookmarks | ||||
| @ 0d2164f0ce0d | @ 0d2164f0ce0d | ||||
| X 0d2164f0ce0d | X 0d2164f0ce0d | ||||
| Z 0d2164f0ce0d | Z 0d2164f0ce0d | ||||
| foo | foo | ||||
| foobar | foobar | ||||
| $ hg push -B Z http://localhost:$HGPORT/ | $ hg push -f -B Z http://localhost:$HGPORT/ | ||||
| pushing to http://localhost:$HGPORT/ | pushing to http://localhost:$HGPORT/ | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| updating bookmark Z | updating bookmark Z | ||||
| [1] | [1] | ||||
| $ hg book -d Z | $ hg book -d Z | ||||
| $ hg in -B http://localhost:$HGPORT/ | $ hg in -B http://localhost:$HGPORT/ | ||||
| comparing with http://localhost:$HGPORT/ | comparing with http://localhost:$HGPORT/ | ||||
| $ cd ../r | $ cd ../r | ||||
| $ hg up -q X | $ hg up -q X | ||||
| $ echo 2 > f2 | $ echo 2 > f2 | ||||
| $ hg ci -qAmr | $ hg ci -qAmr | ||||
| $ hg push -B X | $ hg push -B X | ||||
| pushing to $TESTTMP/addmarks | pushing to $TESTTMP/addmarks | ||||
| searching for changes | searching for changes | ||||
| remote has heads on branch 'default' that are not known locally: a2a606d9ff1b | abort: push rejected: bookmark "X" has changed | ||||
| abort: push creates new remote head 54694f811df9 with bookmark 'X'! | (run 'hg pull', resolve conflicts, and push again) | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | |||||
| [255] | [255] | ||||
| $ cd ../addmarks | $ cd ../addmarks | ||||
| Check summary output for incoming/outgoing bookmarks | Check summary output for incoming/outgoing bookmarks | ||||
| $ hg bookmarks -d X | $ hg bookmarks -d X | ||||
| $ hg bookmarks -d Y | $ hg bookmarks -d Y | ||||
| $ hg summary --remote | grep '^remote:' | $ hg summary --remote | grep '^remote:' | ||||