changeset 14485 | 610873cf064a |
parent 13478 | c631ac076375 |
child 15447 | 9910f60a37ee |
--- a/tests/test-issue1502.t Tue May 31 15:55:23 2011 -0500 +++ b/tests/test-issue1502.t Tue May 31 11:52:22 2011 -0700 @@ -19,8 +19,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - not updating, since new heads added - (run 'hg heads' to see heads, 'hg merge' to merge) + not updating: crosses branches (merge branches or update --check to force update) $ hg -R foo1 book branchy $ hg -R foo1 book