##// 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:

r26374:048e41e9 default
r28189:fac3a24b default
Show More
test-mq-subrepo-svn.t
53 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-mq-subrepo-svn.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require svn13
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
r23172 $ cat <<EOF >> $HGRCPATH
> [extensions]
> mq =
> [diff]
> nodates = 1
> EOF
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
Kevin Bullock
test-subrepo-mq-svn.t: correct comment...
r13326 fn to create new repository, and cd into it
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ mkrepo() {
> hg init $1
> cd $1
> hg qinit
> }
handle svn subrepos safely
$ svnadmin create svn-repo-2499
Mads Kiilerich
tests: cleanup of svn url handling...
r17033
$ SVNREPOPATH=`pwd`/svn-repo-2499/project
#if windows
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
r22947 $ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 #else
Augie Fackler
tests: use $PYTHON instead of hardcoding python...
r22947 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 #endif
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ mkdir -p svn-project-2499/trunk
Yuya Nishihara
tests: suppress verbose output of svn transaction...
r26374 $ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300
qnew on repo w/svn subrepo
$ mkrepo repo-2499-svn-subrepo
Mads Kiilerich
tests: cleanup of svn url handling...
r17033 $ svn co "$SVNREPOURL"/trunk sub
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 Checked out revision 1.
$ echo 'sub = [svn]sub' >> .hgsub
$ hg add .hgsub
Matt Mackall
tests: fixes for svn 1.4.2
r13410 $ hg status -S -X '**/format'
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 A .hgsub
$ hg qnew -m0 0.diff
$ cd sub
$ echo a > a
$ svn add a
A a
$ svn st
Matt Mackall
tests: fixes for svn 1.4.2
r13410 A* a (glob)
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 $ cd ..
$ hg status -S # doesn't show status for svn subrepos (yet)
$ hg qnew -m1 1.diff
FUJIWARA Katsunori
subrepo: add bailifchanged to centralize raising Abort if subrepo is dirty...
r24471 abort: uncommitted changes in subrepository 'sub'
Kevin Bullock
subrepo: separate out mq+svn subrepo tests...
r13300 [255]
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..