diff -r 73cfaa348650 -r c35ffa4249ca tests/test-bookmarks-pushpull.t --- a/tests/test-bookmarks-pushpull.t Wed Nov 05 13:05:32 2014 +0100 +++ b/tests/test-bookmarks-pushpull.t Wed Nov 05 17:25:00 2014 +0000 @@ -54,6 +54,17 @@ X 4e3505fd95835d721066b76e75dbb8cc554d7f77 Y 4e3505fd95835d721066b76e75dbb8cc554d7f77 Z 4e3505fd95835d721066b76e75dbb8cc554d7f77 + +delete the bookmark to repull it + + $ hg book -d X + $ hg pull -B X ../a + pulling from ../a + no changes found + adding remote bookmark X + +finally no-op pull + $ hg pull -B X ../a pulling from ../a no changes found @@ -166,6 +177,18 @@ Y 0:4e3505fd9583 Z 1:0d2164f0ce0d +explicite pull should overwrite the local version (issue4439) + + $ hg pull --config paths.foo=../a foo -B X + pulling from $TESTTMP/a (glob) + no changes found + divergent bookmark @ stored as @foo + importing bookmark X + +reinstall state for further testing: + + $ hg book -fr 9b140be10808 X + revsets should not ignore divergent bookmarks $ hg bookmark -fr 1 Z