comparison tests/test-fetch.t @ 25295:701df761aa94

branch: don't warn about branches if repository has multiple branches already This warning exists to prevent git users from prematurely polluting their namespace when trying out Mercurial. But for repos that already have multiple branches, understanding what branches are is not optional so we should just shut up.
author Matt Mackall <mpm@selenic.com>
date Fri, 22 May 2015 17:08:59 -0500
parents 55fd99a23fdc
children e01bd7385f4f
comparison
equal deleted inserted replaced
25293:ab618e52788a 25295:701df761aa94
166 $ hg -R nbase ci -m a 166 $ hg -R nbase ci -m a
167 $ hg -R nbase up -C 0 167 $ hg -R nbase up -C 0
168 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 168 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
169 $ hg -R nbase branch b 169 $ hg -R nbase branch b
170 marked working directory as branch b 170 marked working directory as branch b
171 (branches are permanent and global, did you want a bookmark?)
172 $ echo b > nbase/b 171 $ echo b > nbase/b
173 $ hg -R nbase ci -Am b 172 $ hg -R nbase ci -Am b
174 adding b 173 adding b
175 174
176 pull in change on foreign branch 175 pull in change on foreign branch
361 $ echo b > ib1/b 360 $ echo b > ib1/b
362 $ hg --cwd ib1 ci -Am onsecond 361 $ hg --cwd ib1 ci -Am onsecond
363 adding b 362 adding b
364 $ hg --cwd ib1 branch -f default 363 $ hg --cwd ib1 branch -f default
365 marked working directory as branch default 364 marked working directory as branch default
366 (branches are permanent and global, did you want a bookmark?)
367 $ echo c > ib1/c 365 $ echo c > ib1/c
368 $ hg --cwd ib1 ci -Am newdefault 366 $ hg --cwd ib1 ci -Am newdefault
369 adding c 367 adding c
370 created new head 368 created new head
371 $ hg clone ib1 ib2 369 $ hg clone ib1 ib2