Mercurial > hg
comparison tests/test-branch-option.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 | 41885892796e |
| children | eb586ed5d8ce |
comparison
equal
deleted
inserted
replaced
| 25293:ab618e52788a | 25295:701df761aa94 |
|---|---|
| 12 $ hg ci -d '0 0' -ma2 | 12 $ hg ci -d '0 0' -ma2 |
| 13 $ hg up 0 | 13 $ hg up 0 |
| 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 15 $ hg branch c | 15 $ hg branch c |
| 16 marked working directory as branch c | 16 marked working directory as branch c |
| 17 (branches are permanent and global, did you want a bookmark?) | |
| 18 $ echo c > foo | 17 $ echo c > foo |
| 19 $ hg ci -d '0 0' -mc | 18 $ hg ci -d '0 0' -mc |
| 20 $ hg tag -l z | 19 $ hg tag -l z |
| 21 $ cd .. | 20 $ cd .. |
| 22 $ hg clone -r 0 branch branch2 | 21 $ hg clone -r 0 branch branch2 |
| 29 $ cd branch2 | 28 $ cd branch2 |
| 30 $ hg up 0 | 29 $ hg up 0 |
| 31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 30 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 32 $ hg branch b | 31 $ hg branch b |
| 33 marked working directory as branch b | 32 marked working directory as branch b |
| 34 (branches are permanent and global, did you want a bookmark?) | |
| 35 $ echo b > foo | 33 $ echo b > foo |
| 36 $ hg ci -d '0 0' -mb | 34 $ hg ci -d '0 0' -mb |
| 37 $ hg up 0 | 35 $ hg up 0 |
| 38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 39 $ hg --encoding utf-8 branch æ | 37 $ hg --encoding utf-8 branch æ |
| 40 marked working directory as branch \xc3\xa6 (esc) | 38 marked working directory as branch \xc3\xa6 (esc) |
| 41 (branches are permanent and global, did you want a bookmark?) | |
| 42 $ echo ae1 > foo | 39 $ echo ae1 > foo |
| 43 $ hg ci -d '0 0' -mae1 | 40 $ hg ci -d '0 0' -mae1 |
| 44 $ hg up 0 | 41 $ hg up 0 |
| 45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 46 $ hg --encoding utf-8 branch -f æ | 43 $ hg --encoding utf-8 branch -f æ |
| 47 marked working directory as branch \xc3\xa6 (esc) | 44 marked working directory as branch \xc3\xa6 (esc) |
| 48 (branches are permanent and global, did you want a bookmark?) | |
| 49 $ echo ae2 > foo | 45 $ echo ae2 > foo |
| 50 $ hg ci -d '0 0' -mae2 | 46 $ hg ci -d '0 0' -mae2 |
| 51 created new head | 47 created new head |
| 52 $ hg up 0 | 48 $ hg up 0 |
| 53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 54 $ hg branch -f b | 50 $ hg branch -f b |
| 55 marked working directory as branch b | 51 marked working directory as branch b |
| 56 (branches are permanent and global, did you want a bookmark?) | |
| 57 $ echo b2 > foo | 52 $ echo b2 > foo |
| 58 $ hg ci -d '0 0' -mb2 | 53 $ hg ci -d '0 0' -mb2 |
| 59 created new head | 54 created new head |
| 60 | 55 |
| 61 unknown branch and fallback | 56 unknown branch and fallback |