Mercurial > public > mercurial-scm > hg-stable
diff tests/test-bookmarks-pushpull.t @ 17043:6f89c3f0192d
fix push of moved bookmark when creating new branch heads
The problem occured when pushing a changeset that at the same time creates a
new named branch head and moves a bookmark. The code invoked methods that only
exist on localrepo instances, so it failed for any other type of remote. The
test suite only tested against local remotes.
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Tue, 26 Jun 2012 23:05:25 +0200 |
| parents | 955662c1d0e9 |
| children | 28ed1c4511ce |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Tue Jun 26 15:08:10 2012 -0500 +++ b/tests/test-bookmarks-pushpull.t Tue Jun 26 23:05:25 2012 +0200 @@ -177,8 +177,18 @@ adding f2 created new head $ hg book -f Y - $ hg push ../a - pushing to ../a + + $ cat <<EOF > ../a/.hg/hgrc + > [web] + > push_ssl = false + > allow_push = * + > EOF + + $ hg -R ../a serve -p $HGPORT2 -d --pid-file=../hg2.pid + $ cat ../hg2.pid >> $DAEMON_PIDS + + $ hg push http://localhost:$HGPORT2/ + pushing to http://localhost:$HGPORT2/ searching for changes abort: push creates new remote head 4efff6d98829! (did you forget to merge? use push -f to force)