Mercurial > hg
comparison tests/test-branch-option.t @ 15615:41885892796e stable
branch: warn on branching
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 08 Dec 2011 14:32:44 -0600 |
| parents | 05fffd665170 |
| children | 701df761aa94 |
comparison
equal
deleted
inserted
replaced
| 15610:09b200396384 | 15615:41885892796e |
|---|---|
| 2 | 2 |
| 3 $ hg init branch | 3 $ hg init branch |
| 4 $ cd branch | 4 $ cd branch |
| 5 $ hg branch a | 5 $ hg branch a |
| 6 marked working directory as branch a | 6 marked working directory as branch a |
| 7 (branches are permanent and global, did you want a bookmark?) | |
| 7 $ echo a > foo | 8 $ echo a > foo |
| 8 $ hg ci -d '0 0' -Ama | 9 $ hg ci -d '0 0' -Ama |
| 9 adding foo | 10 adding foo |
| 10 $ echo a2 > foo | 11 $ echo a2 > foo |
| 11 $ hg ci -d '0 0' -ma2 | 12 $ hg ci -d '0 0' -ma2 |
| 12 $ hg up 0 | 13 $ hg up 0 |
| 13 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 |
| 14 $ hg branch c | 15 $ hg branch c |
| 15 marked working directory as branch c | 16 marked working directory as branch c |
| 17 (branches are permanent and global, did you want a bookmark?) | |
| 16 $ echo c > foo | 18 $ echo c > foo |
| 17 $ hg ci -d '0 0' -mc | 19 $ hg ci -d '0 0' -mc |
| 18 $ hg tag -l z | 20 $ hg tag -l z |
| 19 $ cd .. | 21 $ cd .. |
| 20 $ hg clone -r 0 branch branch2 | 22 $ hg clone -r 0 branch branch2 |
| 27 $ cd branch2 | 29 $ cd branch2 |
| 28 $ hg up 0 | 30 $ hg up 0 |
| 29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 30 $ hg branch b | 32 $ hg branch b |
| 31 marked working directory as branch b | 33 marked working directory as branch b |
| 34 (branches are permanent and global, did you want a bookmark?) | |
| 32 $ echo b > foo | 35 $ echo b > foo |
| 33 $ hg ci -d '0 0' -mb | 36 $ hg ci -d '0 0' -mb |
| 34 $ hg up 0 | 37 $ hg up 0 |
| 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 36 $ hg --encoding utf-8 branch æ | 39 $ hg --encoding utf-8 branch æ |
| 37 marked working directory as branch \xc3\xa6 (esc) | 40 marked working directory as branch \xc3\xa6 (esc) |
| 41 (branches are permanent and global, did you want a bookmark?) | |
| 38 $ echo ae1 > foo | 42 $ echo ae1 > foo |
| 39 $ hg ci -d '0 0' -mae1 | 43 $ hg ci -d '0 0' -mae1 |
| 40 $ hg up 0 | 44 $ hg up 0 |
| 41 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 42 $ hg --encoding utf-8 branch -f æ | 46 $ hg --encoding utf-8 branch -f æ |
| 43 marked working directory as branch \xc3\xa6 (esc) | 47 marked working directory as branch \xc3\xa6 (esc) |
| 48 (branches are permanent and global, did you want a bookmark?) | |
| 44 $ echo ae2 > foo | 49 $ echo ae2 > foo |
| 45 $ hg ci -d '0 0' -mae2 | 50 $ hg ci -d '0 0' -mae2 |
| 46 created new head | 51 created new head |
| 47 $ hg up 0 | 52 $ hg up 0 |
| 48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 49 $ hg branch -f b | 54 $ hg branch -f b |
| 50 marked working directory as branch b | 55 marked working directory as branch b |
| 56 (branches are permanent and global, did you want a bookmark?) | |
| 51 $ echo b2 > foo | 57 $ echo b2 > foo |
| 52 $ hg ci -d '0 0' -mb2 | 58 $ hg ci -d '0 0' -mb2 |
| 53 created new head | 59 created new head |
| 54 | 60 |
| 55 unknown branch and fallback | 61 unknown branch and fallback |