| Alphare | |
| mharbison72 |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/discovery.py (10 lines) | |||
| M | tests/test-bookflow.t (2 lines) | |||
| M | tests/test-bookmarks-pushpull.t (6 lines) | |||
| M | tests/test-exchange-obsmarkers-case-A3.t (2 lines) | |||
| M | tests/test-obsolete-checkheads.t (8 lines) | |||
| M | tests/test-phases-exchange.t (2 lines) | |||
| M | tests/test-push-checkheads-multibranches-E3.t (2 lines) | |||
| M | tests/test-push-checkheads-partial-C1.t (2 lines) | |||
| M | tests/test-push-checkheads-partial-C2.t (2 lines) | |||
| M | tests/test-push-checkheads-partial-C3.t (2 lines) | |||
| M | tests/test-push-checkheads-partial-C4.t (2 lines) | |||
| M | tests/test-push-checkheads-unpushed-D1.t (2 lines) | |||
| M | tests/test-push-checkheads-unpushed-D2.t (2 lines) | |||
| M | tests/test-push-checkheads-unpushed-D3.t (6 lines) | |||
| M | tests/test-push-checkheads-unpushed-D4.t (2 lines) | |||
| M | tests/test-push-checkheads-unpushed-D5.t (2 lines) | |||
| M | tests/test-push-checkheads-unpushed-D6.t (2 lines) | |||
| M | tests/test-push-warn.t (46 lines) | |||
| M | tests/test-push.t (2 lines) | |||
| M | tests/test-subrepo.t (4 lines) | |||
| M | tests/test-treediscovery-legacy.t (2 lines) | |||
| M | tests/test-treediscovery.t (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| branchnames = b', '.join(sorted(newbranches)) | branchnames = b', '.join(sorted(newbranches)) | ||||
| # Calculate how many of the new branches are closed branches | # Calculate how many of the new branches are closed branches | ||||
| closedbranches = set() | closedbranches = set() | ||||
| for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | ||||
| if isclosed: | if isclosed: | ||||
| closedbranches.add(tag) | closedbranches.add(tag) | ||||
| closedbranches = closedbranches & set(newbranches) | closedbranches = closedbranches & set(newbranches) | ||||
| if closedbranches: | if closedbranches: | ||||
| errmsg = _(b"push creates new remote branches: %s (%d closed)!") % ( | errmsg = _(b"push creates new remote branches: %s (%d closed)") % ( | ||||
| branchnames, | branchnames, | ||||
| len(closedbranches), | len(closedbranches), | ||||
| ) | ) | ||||
| else: | else: | ||||
| errmsg = _(b"push creates new remote branches: %s!") % branchnames | errmsg = _(b"push creates new remote branches: %s") % branchnames | ||||
| hint = _(b"use 'hg push --new-branch' to create new remote branches") | hint = _(b"use 'hg push --new-branch' to create new remote branches") | ||||
| raise error.Abort(errmsg, hint=hint) | raise error.Abort(errmsg, hint=hint) | ||||
| # 2. Find heads that we need not warn about | # 2. Find heads that we need not warn about | ||||
| nowarnheads = _nowarnheads(pushop) | nowarnheads = _nowarnheads(pushop) | ||||
| # 3. Check for new heads. | # 3. Check for new heads. | ||||
| # If there are more heads after the push than before, a suitable | # If there are more heads after the push than before, a suitable | ||||
| ) | ) | ||||
| elif len(newhs) > len(oldhs): | elif len(newhs) > len(oldhs): | ||||
| # remove bookmarked or existing remote heads from the new heads list | # remove bookmarked or existing remote heads from the new heads list | ||||
| dhs = sorted(newhs - nowarnheads - oldhs) | dhs = sorted(newhs - nowarnheads - oldhs) | ||||
| if dhs: | if dhs: | ||||
| if errormsg is None: | if errormsg is None: | ||||
| if branch not in (b'default', None): | if branch not in (b'default', None): | ||||
| errormsg = _( | errormsg = _( | ||||
| b"push creates new remote head %s on branch '%s'!" | b"push creates new remote head %s on branch '%s'" | ||||
| ) % (short(dhs[0]), branch,) | ) % (short(dhs[0]), branch,) | ||||
| elif repo[dhs[0]].bookmarks(): | elif repo[dhs[0]].bookmarks(): | ||||
| errormsg = _( | errormsg = _( | ||||
| b"push creates new remote head %s " | b"push creates new remote head %s " | ||||
| b"with bookmark '%s'!" | b"with bookmark '%s'" | ||||
| ) % (short(dhs[0]), repo[dhs[0]].bookmarks()[0]) | ) % (short(dhs[0]), repo[dhs[0]].bookmarks()[0]) | ||||
| else: | else: | ||||
| errormsg = _(b"push creates new remote head %s!") % short( | errormsg = _(b"push creates new remote head %s") % short( | ||||
| dhs[0] | dhs[0] | ||||
| ) | ) | ||||
| if unsyncedheads: | if unsyncedheads: | ||||
| hint = _( | hint = _( | ||||
| b"pull and merge or" | b"pull and merge or" | ||||
| b" see 'hg help push' for details about" | b" see 'hg help push' for details about" | ||||
| b" pushing new heads" | b" pushing new heads" | ||||
| ) | ) | ||||
| $ 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 creates new remote head * with bookmark 'X' (glob) | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (pull and merge or see 'hg help push' for details about pushing new heads) | ||||
| [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 | ||||
| > EOF | > EOF | ||||
| $ hg serve -R ../a -p $HGPORT2 -d --pid-file=../hg2.pid | $ hg serve -R ../a -p $HGPORT2 -d --pid-file=../hg2.pid | ||||
| $ cat ../hg2.pid >> $DAEMON_PIDS | $ cat ../hg2.pid >> $DAEMON_PIDS | ||||
| $ hg push http://localhost:$HGPORT2/ | $ hg push http://localhost:$HGPORT2/ | ||||
| pushing to http://localhost:$HGPORT2/ | pushing to http://localhost:$HGPORT2/ | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! | abort: push creates new remote head c922c0139ca0 with bookmark 'Y' | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg -R ../a book | $ hg -R ../a book | ||||
| @ 1:0d2164f0ce0d | @ 1:0d2164f0ce0d | ||||
| * X 1:0d2164f0ce0d | * X 1:0d2164f0ce0d | ||||
| Y 3:f6fc62dde3c0 | Y 3:f6fc62dde3c0 | ||||
| Z 1:0d2164f0ce0d | Z 1:0d2164f0ce0d | ||||
| Unrelated marker does not alter the decision | Unrelated marker does not alter the decision | ||||
| $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | ||||
| 1 new obsolescence markers | 1 new obsolescence markers | ||||
| $ hg push http://localhost:$HGPORT2/ | $ hg push http://localhost:$HGPORT2/ | ||||
| pushing to http://localhost:$HGPORT2/ | pushing to http://localhost:$HGPORT2/ | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head c922c0139ca0 with bookmark 'Y'! | abort: push creates new remote head c922c0139ca0 with bookmark 'Y' | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg -R ../a book | $ hg -R ../a book | ||||
| @ 1:0d2164f0ce0d | @ 1:0d2164f0ce0d | ||||
| * X 1:0d2164f0ce0d | * X 1:0d2164f0ce0d | ||||
| Y 3:f6fc62dde3c0 | Y 3:f6fc62dde3c0 | ||||
| Z 1:0d2164f0ce0d | Z 1:0d2164f0ce0d | ||||
| $ 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 | remote has heads on branch 'default' that are not known locally: a2a606d9ff1b | ||||
| abort: push creates new remote head 54694f811df9 with bookmark 'X'! | abort: push creates new remote head 54694f811df9 with bookmark 'X' | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (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 | ||||
| ----------------------------------------------------------- | ----------------------------------------------------------- | ||||
| check it complains about multiple heads | check it complains about multiple heads | ||||
| $ cd A.3.b | $ cd A.3.b | ||||
| $ hg push -R main -r 'desc(A1)' pushdest | $ hg push -R main -r 'desc(A1)' pushdest | ||||
| pushing to pushdest | pushing to pushdest | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head e5ea8f9c7314! | abort: push creates new remote head e5ea8f9c7314 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd .. | $ cd .. | ||||
| test obsmarkers exchange. | test obsmarkers exchange. | ||||
| $ dotest A.3.b A1 -f | $ dotest A.3.b A1 -f | ||||
| ## Running testcase A.3.b | ## Running testcase A.3.b | ||||
| o b4952fcf48cf (public) add base | o b4952fcf48cf (public) add base | ||||
| Abort: old will still be an head because it's public. | Abort: old will still be an head because it's public. | ||||
| $ hg push | $ hg push | ||||
| pushing to $TESTTMP/remote | pushing to $TESTTMP/remote | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 71e3228bffe1! | abort: push creates new remote head 71e3228bffe1 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| old head is now public (public remote version) | old head is now public (public remote version) | ||||
| ============================================== | ============================================== | ||||
| TODO: Not implemented yet. | TODO: Not implemented yet. | ||||
| old exists remotely as draft. It is obsoleted by new but we don't push new. | old exists remotely as draft. It is obsoleted by new but we don't push new. | ||||
| Push should abort on new head | Push should abort on new head | ||||
| $ hg push -r 'desc("other")' | $ hg push -r 'desc("other")' | ||||
| pushing to $TESTTMP/remote | pushing to $TESTTMP/remote | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head d7d41ccbd4de! | abort: push creates new remote head d7d41ccbd4de | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| Both precursors and successors are already know remotely. Descendant adds heads | Both precursors and successors are already know remotely. Descendant adds heads | ||||
| =============================================================================== | =============================================================================== | ||||
| We do not have enought data to take the right decision, we should fail | We do not have enought data to take the right decision, we should fail | ||||
| $ hg push | $ hg push | ||||
| pushing to $TESTTMP/remote | pushing to $TESTTMP/remote | ||||
| searching for changes | searching for changes | ||||
| remote has heads on branch 'default' that are not known locally: c70b08862e08 | remote has heads on branch 'default' that are not known locally: c70b08862e08 | ||||
| abort: push creates new remote head 71e3228bffe1! | abort: push creates new remote head 71e3228bffe1 | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (pull and merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| Pulling the missing data makes it work | Pulling the missing data makes it work | ||||
| $ hg pull | $ hg pull | ||||
| pulling from $TESTTMP/remote | pulling from $TESTTMP/remote | ||||
| searching for changes | searching for changes | ||||
| | x c70b08862e08 (draft) add old | | x c70b08862e08 (draft) add old | ||||
| |/ | |/ | ||||
| o b4952fcf48cf (public) add base | o b4952fcf48cf (public) add base | ||||
| $ hg push | $ hg push | ||||
| pushing to $TESTTMP/remote | pushing to $TESTTMP/remote | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 350a93b716be! | abort: push creates new remote head 350a93b716be | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| appear on the remote side. | appear on the remote side. | ||||
| $ hg -R ../mu phase --secret --force 967b449fbc94 | $ hg -R ../mu phase --secret --force 967b449fbc94 | ||||
| test-debug-phase: move rev 9: 0 -> 2 | test-debug-phase: move rev 9: 0 -> 2 | ||||
| test-debug-phase: move rev 10: 1 -> 2 | test-debug-phase: move rev 10: 1 -> 2 | ||||
| $ hg push -r 435b5d83910c ../mu | $ hg push -r 435b5d83910c ../mu | ||||
| pushing to ../mu | pushing to ../mu | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 435b5d83910c! | abort: push creates new remote head 435b5d83910c | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head | $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head | ||||
| pushing to ../mu | pushing to ../mu | ||||
| searching for changes | searching for changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push -r 'desc("C1")' | $ hg push -r 'desc("C1")' | ||||
| pushing to $TESTTMP/E1/server | pushing to $TESTTMP/E1/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head dc44c53142f0! | abort: push creates new remote head dc44c53142f0 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push | $ hg push | ||||
| pushing to $TESTTMP/C1/server | pushing to $TESTTMP/C1/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 25c56d33e4c4! | abort: push creates new remote head 25c56d33e4c4 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push --rev 'desc(A1)' | $ hg push --rev 'desc(A1)' | ||||
| pushing to $TESTTMP/C2/server | pushing to $TESTTMP/C2/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head f6082bc4ffef! | abort: push creates new remote head f6082bc4ffef | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push | $ hg push | ||||
| pushing to $TESTTMP/C3/server | pushing to $TESTTMP/C3/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 0f88766e02d6! | abort: push creates new remote head 0f88766e02d6 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push --rev 'desc(C0)' | $ hg push --rev 'desc(C0)' | ||||
| pushing to $TESTTMP/C4/server | pushing to $TESTTMP/C4/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 0f88766e02d6! | abort: push creates new remote head 0f88766e02d6 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push -r 'desc(B0)' | $ hg push -r 'desc(B0)' | ||||
| pushing to $TESTTMP/D1/server | pushing to $TESTTMP/D1/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 74ff5441d343! | abort: push creates new remote head 74ff5441d343 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push --rev 'desc(C0)' | $ hg push --rev 'desc(C0)' | ||||
| pushing to $TESTTMP/D2/server | pushing to $TESTTMP/D2/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 0f88766e02d6! | abort: push creates new remote head 0f88766e02d6 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push --rev 'desc(A1)' | $ hg push --rev 'desc(A1)' | ||||
| pushing to $TESTTMP/D3/server | pushing to $TESTTMP/D3/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head f6082bc4ffef! | abort: push creates new remote head f6082bc4ffef | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push --rev 'desc(B1)' | $ hg push --rev 'desc(B1)' | ||||
| pushing to $TESTTMP/D3/server | pushing to $TESTTMP/D3/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 25c56d33e4c4! | abort: push creates new remote head 25c56d33e4c4 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| Extra testing | Extra testing | ||||
| ------------- | ------------- | ||||
| In this case, even a bare push is creating more heads | In this case, even a bare push is creating more heads | ||||
| $ hg push | $ hg push | ||||
| pushing to $TESTTMP/D3/server | pushing to $TESTTMP/D3/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 25c56d33e4c4! | abort: push creates new remote head 25c56d33e4c4 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing (new branch only) | Actual testing (new branch only) | ||||
| -------------------------------- | -------------------------------- | ||||
| $ hg push --rev 'desc(A1)' | $ hg push --rev 'desc(A1)' | ||||
| pushing to $TESTTMP/D4/server | pushing to $TESTTMP/D4/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head f6082bc4ffef! | abort: push creates new remote head f6082bc4ffef | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| Actual testing (existing branch only) | Actual testing (existing branch only) | ||||
| ------------------------------------ | ------------------------------------ | ||||
| $ hg push --rev 'desc(B1)' | $ hg push --rev 'desc(B1)' | ||||
| pushing to $TESTTMP/D4/server | pushing to $TESTTMP/D4/server | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push --rev 'desc(B1)' | $ hg push --rev 'desc(B1)' | ||||
| pushing to $TESTTMP/D5/server | pushing to $TESTTMP/D5/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 25c56d33e4c4! | abort: push creates new remote head 25c56d33e4c4 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push --rev 'desc(A1)' | $ hg push --rev 'desc(A1)' | ||||
| pushing to $TESTTMP/D5/server | pushing to $TESTTMP/D5/server | ||||
| searching for changes | searching for changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 1 changesets with 1 changes to 1 files | added 1 changesets with 1 changes to 1 files | ||||
| 1 new obsolescence markers | 1 new obsolescence markers | ||||
| obsoleted 1 changesets | obsoleted 1 changesets | ||||
| 1 new orphan changesets | 1 new orphan changesets | ||||
| $ cd ../.. | $ cd ../.. | ||||
| Actual testing | Actual testing | ||||
| -------------- | -------------- | ||||
| $ hg push --rev 'desc(C0)' | $ hg push --rev 'desc(C0)' | ||||
| pushing to $TESTTMP/D6/server | pushing to $TESTTMP/D6/server | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 0f88766e02d6! | abort: push creates new remote head 0f88766e02d6 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd ../.. | $ cd ../.. | ||||
| abort: specified revisions evaluate to an empty set | abort: specified revisions evaluate to an empty set | ||||
| (use different revision arguments) | (use different revision arguments) | ||||
| [10] | [10] | ||||
| $ hg push ../a | $ hg push ../a | ||||
| pushing to ../a | pushing to ../a | ||||
| searching for changes | searching for changes | ||||
| remote has heads on branch 'default' that are not known locally: 1c9246a22a0a | remote has heads on branch 'default' that are not known locally: 1c9246a22a0a | ||||
| abort: push creates new remote head 1e108cc5548c! | abort: push creates new remote head 1e108cc5548c | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (pull and merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push --debug ../a | $ hg push --debug ../a | ||||
| pushing to ../a | pushing to ../a | ||||
| query 1; heads | query 1; heads | ||||
| searching for changes | searching for changes | ||||
| taking quick initial sample | taking quick initial sample | ||||
| query 2; still undecided: 1, sample size is: 1 | query 2; still undecided: 1, sample size is: 1 | ||||
| 2 total queries in *.????s (glob) | 2 total queries in *.????s (glob) | ||||
| listing keys for "phases" | listing keys for "phases" | ||||
| checking for updated bookmarks | checking for updated bookmarks | ||||
| listing keys for "bookmarks" | listing keys for "bookmarks" | ||||
| listing keys for "bookmarks" | listing keys for "bookmarks" | ||||
| remote has heads on branch 'default' that are not known locally: 1c9246a22a0a | remote has heads on branch 'default' that are not known locally: 1c9246a22a0a | ||||
| new remote heads on branch 'default': | new remote heads on branch 'default': | ||||
| 1e108cc5548c | 1e108cc5548c | ||||
| abort: push creates new remote head 1e108cc5548c! | abort: push creates new remote head 1e108cc5548c | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (pull and merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg pull ../a | $ hg pull ../a | ||||
| pulling from ../a | pulling from ../a | ||||
| searching for changes | searching for changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| new changesets 1c9246a22a0a | new changesets 1c9246a22a0a | ||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | (run 'hg heads' to see heads, 'hg merge' to merge) | ||||
| $ hg push ../a | $ hg push ../a | ||||
| pushing to ../a | pushing to ../a | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 1e108cc5548c! | abort: push creates new remote head 1e108cc5548c | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg merge | $ hg merge | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg commit -m "4" | $ hg commit -m "4" | ||||
| 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg ci -m c-d | $ hg ci -m c-d | ||||
| $ hg push ../c | $ hg push ../c | ||||
| pushing to ../c | pushing to ../c | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 6346d66eb9f5! | abort: push creates new remote head 6346d66eb9f5 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push -r 2 ../c | $ hg push -r 2 ../c | ||||
| pushing to ../c | pushing to ../c | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| [1] | [1] | ||||
| $ hg push -r 3 ../c | $ hg push -r 3 ../c | ||||
| pushing to ../c | pushing to ../c | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head a5dda829a167! | abort: push creates new remote head a5dda829a167 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push -v -r 3 -r 4 ../c | $ hg push -v -r 3 -r 4 ../c | ||||
| pushing to ../c | pushing to ../c | ||||
| searching for changes | searching for changes | ||||
| new remote heads on branch 'default': | new remote heads on branch 'default': | ||||
| a5dda829a167 | a5dda829a167 | ||||
| ee8fbc7a0295 | ee8fbc7a0295 | ||||
| abort: push creates new remote head a5dda829a167! | abort: push creates new remote head a5dda829a167 | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push -v -f -r 3 -r 4 ../c | $ hg push -v -f -r 3 -r 4 ../c | ||||
| pushing to ../c | pushing to ../c | ||||
| searching for changes | searching for changes | ||||
| 2 changesets found | 2 changesets found | ||||
| uncompressed size of bundle content: | uncompressed size of bundle content: | ||||
| $ hg -q up 0 | $ hg -q up 0 | ||||
| $ echo 5 > foo | $ echo 5 > foo | ||||
| $ hg -q branch c | $ hg -q branch c | ||||
| $ hg -q ci -m 5 | $ hg -q ci -m 5 | ||||
| $ hg push ../f | $ hg push ../f | ||||
| pushing to ../f | pushing to ../f | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: c! | abort: push creates new remote branches: c | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| $ hg push -r 4 -r 5 ../f | $ hg push -r 4 -r 5 ../f | ||||
| pushing to ../f | pushing to ../f | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: c! | abort: push creates new remote branches: c | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| Multiple new branches: | Multiple new branches: | ||||
| $ hg -q branch d | $ hg -q branch d | ||||
| $ echo 6 > foo | $ echo 6 > foo | ||||
| $ hg -q ci -m 6 | $ hg -q ci -m 6 | ||||
| $ hg push ../f | $ hg push ../f | ||||
| pushing to ../f | pushing to ../f | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: c, d! | abort: push creates new remote branches: c, d | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| $ hg push -r 4 -r 6 ../f | $ hg push -r 4 -r 6 ../f | ||||
| pushing to ../f | pushing to ../f | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: c, d! | abort: push creates new remote branches: c, d | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| $ cd ../g | $ cd ../g | ||||
| Fail on multiple head push: | Fail on multiple head push: | ||||
| $ hg -q up 1 | $ hg -q up 1 | ||||
| $ echo 7 > foo | $ echo 7 > foo | ||||
| $ hg -q ci -m 7 | $ hg -q ci -m 7 | ||||
| $ hg push -r 4 -r 7 ../f | $ hg push -r 4 -r 7 ../f | ||||
| pushing to ../f | pushing to ../f | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 0b715ef6ff8f on branch 'a'! | abort: push creates new remote head 0b715ef6ff8f on branch 'a' | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| Push replacement head on existing branches: | Push replacement head on existing branches: | ||||
| $ hg -q up 3 | $ hg -q up 3 | ||||
| $ echo 8 > foo | $ echo 8 > foo | ||||
| $ hg -q ci -m 8 | $ hg -q ci -m 8 | ||||
| $ hg -q up 11 | $ hg -q up 11 | ||||
| $ echo 13 > foo | $ echo 13 > foo | ||||
| $ hg -q branch e | $ hg -q branch e | ||||
| $ hg -q ci -m 13d | $ hg -q ci -m 13d | ||||
| $ hg push -r 12 -r 13 ../f | $ hg push -r 12 -r 13 ../f | ||||
| pushing to ../f | pushing to ../f | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: e! | abort: push creates new remote branches: e | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| Using --new-branch to push new named branch: | Using --new-branch to push new named branch: | ||||
| $ hg push --new-branch -r 12 -r 13 ../f | $ hg push --new-branch -r 12 -r 13 ../f | ||||
| pushing to ../f | pushing to ../f | ||||
| created new head | created new head | ||||
| $ for i in `"$PYTHON" $TESTDIR/seq.py 3`; do hg -R h up -q 0; echo $i > h/b; hg -R h ci -qAm$i; done | $ for i in `"$PYTHON" $TESTDIR/seq.py 3`; do hg -R h up -q 0; echo $i > h/b; hg -R h ci -qAm$i; done | ||||
| $ hg -R i push h | $ hg -R i push h | ||||
| pushing to h | pushing to h | ||||
| searching for changes | searching for changes | ||||
| remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 | remote has heads on branch 'default' that are not known locally: 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 | ||||
| abort: push creates new remote head 97bd0c84d346! | abort: push creates new remote head 97bd0c84d346 | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (pull and merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx | $ hg -R h up -q 0; echo x > h/b; hg -R h ci -qAmx | ||||
| $ hg -R i push h | $ hg -R i push h | ||||
| pushing to h | pushing to h | ||||
| searching for changes | searching for changes | ||||
| remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 and 1 others | remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 and 1 others | ||||
| abort: push creates new remote head 97bd0c84d346! | abort: push creates new remote head 97bd0c84d346 | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (pull and merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg -R i push h -v | $ hg -R i push h -v | ||||
| pushing to h | pushing to h | ||||
| searching for changes | searching for changes | ||||
| remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 | remote has heads on branch 'default' that are not known locally: 18ddb72c4590 534543e22c29 764f8ec07b96 afe7cc7679f5 ce4212fc8847 | ||||
| new remote heads on branch 'default': | new remote heads on branch 'default': | ||||
| 97bd0c84d346 | 97bd0c84d346 | ||||
| abort: push creates new remote head 97bd0c84d346! | abort: push creates new remote head 97bd0c84d346 | ||||
| (pull and merge or see 'hg help push' for details about pushing new heads) | (pull and merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| Check prepush logic with merged branches: | Check prepush logic with merged branches: | ||||
| $ hg init j | $ hg init j | ||||
| $ hg -R j branch a | $ hg -R j branch a | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg -R k ci -m merge | $ hg -R k ci -m merge | ||||
| $ hg -R k push -r a j | $ hg -R k push -r a j | ||||
| pushing to j | pushing to j | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: b! | abort: push creates new remote branches: b | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| Prepush -r should not allow you to sneak in new heads: | Prepush -r should not allow you to sneak in new heads: | ||||
| $ hg init l | $ hg init l | ||||
| $ cd l | $ cd l | ||||
| $ hg -q branch -f b | $ hg -q branch -f b | ||||
| $ hg -q ci -mb2 | $ hg -q ci -mb2 | ||||
| $ hg -q merge 3 | $ hg -q merge 3 | ||||
| $ hg -q ci -mma | $ hg -q ci -mma | ||||
| $ hg push ../l -b b | $ hg push ../l -b b | ||||
| pushing to ../l | pushing to ../l | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 451211cc22b0 on branch 'a'! | abort: push creates new remote head 451211cc22b0 on branch 'a' | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd .. | $ cd .. | ||||
| Check prepush with new branch head on former topo non-head: | Check prepush with new branch head on former topo non-head: | ||||
| comparing with inner | comparing with inner | ||||
| searching for changes | searching for changes | ||||
| 4: B a3 | 4: B a3 | ||||
| 5: A b3 | 5: A b3 | ||||
| $ hg push inner | $ hg push inner | ||||
| pushing to inner | pushing to inner | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push inner -r4 -r5 | $ hg push inner -r4 -r5 | ||||
| pushing to inner | pushing to inner | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg in inner | $ hg in inner | ||||
| comparing with inner | comparing with inner | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| [1] | [1] | ||||
| Test fail hook | Test fail hook | ||||
| $ hg push inner --config hooks.fail-push="echo running fail-push hook" | $ hg push inner --config hooks.fail-push="echo running fail-push hook" | ||||
| pushing to inner | pushing to inner | ||||
| searching for changes | searching for changes | ||||
| running fail-push hook | running fail-push hook | ||||
| abort: push creates new remote head 7d0f4fb6cf04 on branch 'A'! | abort: push creates new remote head 7d0f4fb6cf04 on branch 'A' | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ cd .. | $ cd .. | ||||
| Test regarding pushing of closed branch/branches(Issue6080) | Test regarding pushing of closed branch/branches(Issue6080) | ||||
| $ hg init x | $ hg init x | ||||
| $ hg -q branch foo | $ hg -q branch foo | ||||
| $ echo 0 > foo | $ echo 0 > foo | ||||
| $ hg -q ci -Am 0 | $ hg -q ci -Am 0 | ||||
| $ hg ci --close-branch -m 'closing branch foo' | $ hg ci --close-branch -m 'closing branch foo' | ||||
| $ hg -q up 0 | $ hg -q up 0 | ||||
| $ hg push ../x | $ hg push ../x | ||||
| pushing to ../x | pushing to ../x | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: foo (1 closed)! | abort: push creates new remote branches: foo (1 closed) | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| When there is more than one closed branches | When there is more than one closed branches | ||||
| $ hg -q branch bar | $ hg -q branch bar | ||||
| $ echo 0 > bar | $ echo 0 > bar | ||||
| $ hg -q ci -Am 0 | $ hg -q ci -Am 0 | ||||
| $ hg ci --close-branch -m 'closing branch bar' | $ hg ci --close-branch -m 'closing branch bar' | ||||
| $ hg -q up 0 | $ hg -q up 0 | ||||
| $ hg push ../x | $ hg push ../x | ||||
| pushing to ../x | pushing to ../x | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: bar, foo (2 closed)! | abort: push creates new remote branches: bar, foo (2 closed) | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| When there are more than one new branches and not all are closed | When there are more than one new branches and not all are closed | ||||
| $ hg -q branch bar1 | $ hg -q branch bar1 | ||||
| $ echo 0 > bar1 | $ echo 0 > bar1 | ||||
| $ hg -q ci -Am 0 | $ hg -q ci -Am 0 | ||||
| $ hg -q up 0 | $ hg -q up 0 | ||||
| $ hg push ../x | $ hg push ../x | ||||
| pushing to ../x | pushing to ../x | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: bar, bar1, foo (2 closed)! | abort: push creates new remote branches: bar, bar1, foo (2 closed) | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| $ cd .. | $ cd .. | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| exporting bookmark push-this-bookmark | exporting bookmark push-this-bookmark | ||||
| [1] | [1] | ||||
| (test that -b (branch) works for specifying "revs") | (test that -b (branch) works for specifying "revs") | ||||
| $ hg push -b default | $ hg push -b default | ||||
| pushing to $TESTTMP/test-require-revs-dest | pushing to $TESTTMP/test-require-revs-dest | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head [0-9a-f]+! (re) | abort: push creates new remote head [0-9a-f]+ (re) | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| (demonstrate that even though we don't have anything to exchange, we're still | (demonstrate that even though we don't have anything to exchange, we're still | ||||
| showing the error) | showing the error) | ||||
| $ hg push | $ hg push | ||||
| pushing to $TESTTMP/test-require-revs-dest | pushing to $TESTTMP/test-require-revs-dest | ||||
| abort: no revisions specified to push | abort: no revisions specified to push | ||||
| (did you mean "hg push -r ."?) | (did you mean "hg push -r ."?) | ||||
| [10] | [10] | ||||
| $ hg push --config paths.default:pushrev=0 | $ hg push --config paths.default:pushrev=0 | ||||
| pushing to $TESTTMP/test-require-revs-dest | pushing to $TESTTMP/test-require-revs-dest | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| [1] | [1] | ||||
| $ echo bah > s/a | $ echo bah > s/a | ||||
| $ hg ci -m12 | $ hg ci -m12 | ||||
| committing subrepository s | committing subrepository s | ||||
| $ hg push | $ hg push | ||||
| pushing to $TESTTMP/t | pushing to $TESTTMP/t | ||||
| no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss | no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss | ||||
| pushing subrepo s to $TESTTMP/t/s | pushing subrepo s to $TESTTMP/t/s | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote head 12a213df6fa9! (in subrepository "s") | abort: push creates new remote head 12a213df6fa9 (in subrepository "s") | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg push -f | $ hg push -f | ||||
| pushing to $TESTTMP/t | pushing to $TESTTMP/t | ||||
| pushing subrepo s/ss to $TESTTMP/t/s/ss | pushing subrepo s/ss to $TESTTMP/t/s/ss | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| pushing subrepo s to $TESTTMP/t/s | pushing subrepo s to $TESTTMP/t/s | ||||
| $ hg -R repo2/s up -C 0 | $ hg -R repo2/s up -C 0 | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ echo 2 > repo2/s/b | $ echo 2 > repo2/s/b | ||||
| $ hg -R repo2/s ci -m3 -A | $ hg -R repo2/s ci -m3 -A | ||||
| adding b | adding b | ||||
| created new head | created new head | ||||
| $ hg -R repo2 ci -m3 | $ hg -R repo2 ci -m3 | ||||
| $ hg -q -R repo2 push | $ hg -q -R repo2 push | ||||
| abort: push creates new remote head cc505f09a8b2! (in subrepository "s") | abort: push creates new remote head cc505f09a8b2 (in subrepository "s") | ||||
| (merge or see 'hg help push' for details about pushing new heads) | (merge or see 'hg help push' for details about pushing new heads) | ||||
| [255] | [255] | ||||
| $ hg -R repo update | $ hg -R repo update | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| test if untracked file is not overwritten | test if untracked file is not overwritten | ||||
| (this also tests that updated .hgsubstate is treated as "modified", | (this also tests that updated .hgsubstate is treated as "modified", | ||||
| 11 a19bfa7e7328: r11 both | 11 a19bfa7e7328: r11 both | ||||
| $ hg pull $remote | $ hg pull $remote | ||||
| pulling from http://localhost:$HGPORT/ | pulling from http://localhost:$HGPORT/ | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| $ hg push $remote | $ hg push $remote | ||||
| pushing to http://localhost:$HGPORT/ | pushing to http://localhost:$HGPORT/ | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: both, name1! | abort: push creates new remote branches: both, name1 | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| $ hg push $remote --new-branch | $ hg push $remote --new-branch | ||||
| pushing to http://localhost:$HGPORT/ | pushing to http://localhost:$HGPORT/ | ||||
| searching for changes | searching for changes | ||||
| remote: adding changesets | remote: adding changesets | ||||
| remote: adding manifests | remote: adding manifests | ||||
| remote: adding file changes | remote: adding file changes | ||||
| 11 a19bfa7e7328: r11 both | 11 a19bfa7e7328: r11 both | ||||
| $ hg pull $remote | $ hg pull $remote | ||||
| pulling from http://localhost:$HGPORT/ | pulling from http://localhost:$HGPORT/ | ||||
| searching for changes | searching for changes | ||||
| no changes found | no changes found | ||||
| $ hg push $remote | $ hg push $remote | ||||
| pushing to http://localhost:$HGPORT/ | pushing to http://localhost:$HGPORT/ | ||||
| searching for changes | searching for changes | ||||
| abort: push creates new remote branches: both, name1! | abort: push creates new remote branches: both, name1 | ||||
| (use 'hg push --new-branch' to create new remote branches) | (use 'hg push --new-branch' to create new remote branches) | ||||
| [255] | [255] | ||||
| $ hg push $remote --new-branch | $ hg push $remote --new-branch | ||||
| pushing to http://localhost:$HGPORT/ | pushing to http://localhost:$HGPORT/ | ||||
| searching for changes | searching for changes | ||||
| remote: adding changesets | remote: adding changesets | ||||
| remote: adding manifests | remote: adding manifests | ||||
| remote: adding file changes | remote: adding file changes | ||||