# HG changeset patch # User Pierre-Yves David # Date 2015-09-18 00:17:54 # Node ID 91cad8eb79511111c706a794cf5a658d762236b0 # Parent c258f4d2bfb2fad750ff8601ec8ff7529f3e1c7e bookmark: actually test update behavior in both cases The test claimed to test pull --update behaved the same way as pull + update, but the behavior of pull + update was never tested. We now test both. diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t --- a/tests/test-bookmarks.t +++ b/tests/test-bookmarks.t @@ -569,6 +569,30 @@ pull --update works the same as pull && $ hg bookmark -r3 Y moving bookmark 'Y' forward from db815d6d32e6 + $ cp -r ../cloned-bookmarks-update ../cloned-bookmarks-manual-update + +(manual version) + + $ hg -R ../cloned-bookmarks-manual-update update Y + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + (activating bookmark Y) + $ hg -R ../cloned-bookmarks-manual-update pull . + pulling from . + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files (+1 heads) + updating bookmark Y + updating bookmark Z + (run 'hg heads' to see heads, 'hg merge' to merge) + $ hg -R ../cloned-bookmarks-manual-update update + updating to active bookmark Y + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (activating bookmark Y) + +(all in one version) + $ hg -R ../cloned-bookmarks-update update Y 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark Y)