Mercurial > public > mercurial-scm > hg-stable
diff tests/test-fetch.t @ 15615:41885892796e stable
branch: warn on branching
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 08 Dec 2011 14:32:44 -0600 |
parents | f6d5d01725db |
children | fc8c7a5ccc4a |
line wrap: on
line diff
--- a/tests/test-fetch.t Mon Dec 05 17:09:11 2011 -0600 +++ b/tests/test-fetch.t Thu Dec 08 14:32:44 2011 -0600 @@ -142,12 +142,14 @@ adding a $ hg -R nbase branch a marked working directory as branch a + (branches are permanent and global, did you want a bookmark?) $ echo a > nbase/a $ hg -R nbase ci -m a $ hg -R nbase up -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R nbase branch b marked working directory as branch b + (branches are permanent and global, did you want a bookmark?) $ echo b > nbase/b $ hg -R nbase ci -Am b adding b @@ -316,6 +318,7 @@ $ hg -R n1 ci -m next $ hg -R n2 branch topic marked working directory as branch topic + (branches are permanent and global, did you want a bookmark?) $ hg -R n2 fetch -m merge n1 abort: working dir not at branch tip (use "hg update" to check out branch tip) [255] @@ -334,11 +337,13 @@ adding a $ hg --cwd ib1 branch second marked working directory as branch second + (branches are permanent and global, did you want a bookmark?) $ echo b > ib1/b $ hg --cwd ib1 ci -Am onsecond adding b $ hg --cwd ib1 branch -f default marked working directory as branch default + (branches are permanent and global, did you want a bookmark?) $ echo c > ib1/c $ hg --cwd ib1 ci -Am newdefault adding c