##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default
r28189:fac3a24b default
Show More
test-http-clone-r.t
207 lines | 6.0 KiB | text/troff | Tads3Lexer
/ tests / test-http-clone-r.t
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
tests: replace exit 80 with #require
 r22046 #require serve
Mads Kiilerich
tests: use 'hghave serve' to guard tests that requires serve daemon management
 r15446
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
 r14117 creating 'remote
Matt Mackall
tests: unify test-http-clone-r
 r12448
$ hg init remote
$ cd remote
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
 r16350 $ hg unbundle "$TESTDIR/bundles/remote.hg"
Nicolas Dumazet
tests: create a bundle to bootstrap tests using a remote repository...
 r14117 adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
Matt Mackall
tests: unify test-http-clone-r
 r12448 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Starting server
$ hg serve -p $HGPORT -E ../error.log -d --pid-file=../hg1.pid
$ cd ..
$ cat hg1.pid >> $DAEMON_PIDS
clone remote via stream
$ for i in 0 1 2 3 4 5 6 7 8; do
> hg clone -r "$i" http://localhost:$HGPORT/ test-"$i"
> if cd test-"$i"; then
> hg verify
> cd ..
> fi
> done
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 4 changesets, 4 total revisions
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 4 changesets, 5 total revisions
adding changesets
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
3 files, 5 changesets, 6 total revisions
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 5 total revisions
$ cd test-8
$ hg pull ../test-7
pulling from ../test-7
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
$ cd ..
$ cd test-1
$ hg pull -r 4 http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
 r12643 pulling from http://localhost:$HGPORT/
Matt Mackall
tests: unify test-http-clone-r
 r12448 searching for changes
adding changesets
adding manifests
adding file changes
Peter Arrenbrecht
discovery: avoid discovery when local graph is a subset of remote...
 r13742 added 1 changesets with 0 changes to 0 files (+1 heads)
Matt Mackall
tests: unify test-http-clone-r
 r12448 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 2 total revisions
$ hg pull http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
 r12643 pulling from http://localhost:$HGPORT/
Matt Mackall
tests: unify test-http-clone-r
 r12448 searching for changes
adding changesets
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files
(run 'hg update' to get a working copy)
$ cd ..
$ cd test-2
$ hg pull -r 5 http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
 r12643 pulling from http://localhost:$HGPORT/
Matt Mackall
tests: unify test-http-clone-r
 r12448 searching for changes
adding changesets
adding manifests
adding file changes
Peter Arrenbrecht
discovery: avoid discovery when local graph is a subset of remote...
 r13742 added 2 changesets with 0 changes to 0 files (+1 heads)
Matt Mackall
tests: unify test-http-clone-r
 r12448 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 5 changesets, 3 total revisions
$ hg pull http://localhost:$HGPORT/
Mads Kiilerich
tests: reintroduce ":$HGPORT" in test output...
 r12643 pulling from http://localhost:$HGPORT/
Matt Mackall
tests: unify test-http-clone-r
 r12448 searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
(run 'hg update' to get a working copy)
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
$ cd ..
Yuya Nishihara
clone: abort if default destination has no meaningful name (BC)...
 r20800
no default destination if url has no path:
$ hg clone http://localhost:$HGPORT/
abort: empty destination path is not valid
[255]
Matt Mackall
tests: unify test-http-clone-r
 r12448 $ cat error.log