##// END OF EJS Templates
rebase: choose default destination the same way as 'hg merge' (BC)...
rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

File last commit:

r25474:8c14f87b default
r28189:fac3a24b default
Show More
test-unbundlehash.t
45 lines | 1.4 KiB | text/troff | Tads3Lexer
/ tests / test-unbundlehash.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require killdaemons
Shuhei Takahashi
wireproto: allow unbundle with hashed heads parameter (issue2126)...
r13942
Test wire protocol unbundle with hashed heads (capability: unbundlehash)
Pierre-Yves David
test: lock test-unbundlehash to bundle1 usage...
r25374 $ cat << EOF >> $HGRCPATH
> [experimental]
> # This tests is intended for bundle1 only.
> # bundle2 carries the head information inside the bundle itself and
> # always uses 'force' as the heads value.
> bundle2-exp = False
> EOF
Shuhei Takahashi
wireproto: allow unbundle with hashed heads parameter (issue2126)...
r13942 Create a remote repository.
$ hg init remote
$ hg serve -R remote --config web.push_ssl=False --config web.allow_push=* -p $HGPORT -d --pid-file=hg1.pid -E error.log -A access.log
$ cat hg1.pid >> $DAEMON_PIDS
Clone the repository and push a change.
$ hg clone http://localhost:$HGPORT/ local
no changes found
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ touch local/README
$ hg ci -R local -A -m hoge
adding README
$ hg push -R local
pushing to http://localhost:$HGPORT/
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
Ensure hashed heads format is used.
The hash here is always the same since the remote repository only has the null head.
$ cat access.log | grep unbundle
Matt Mackall
http: minor tweaks to long arg handling...
r14094 * - - [*] "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+6768033e216468247bd031a0a2d9876d79818f8f (glob)
Patrick Mezard
tests: enable more server tests on Windows
r17539
Explicitly kill daemons to let the test exit on Windows
Matt Mackall
tests: drop DAEMON_PIDS from killdaemons calls
r25474 $ killdaemons.py
Patrick Mezard
tests: enable more server tests on Windows
r17539