Mercurial > hg
comparison tests/test-record.t @ 15615:41885892796e stable
branch: warn on branching
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 08 Dec 2011 14:32:44 -0600 |
| parents | fb446228c0d4 |
| children | fc8c7a5ccc4a |
comparison
equal
deleted
inserted
replaced
| 15610:09b200396384 | 15615:41885892796e |
|---|---|
| 892 $ touch iwillmergethat | 892 $ touch iwillmergethat |
| 893 $ hg add iwillmergethat | 893 $ hg add iwillmergethat |
| 894 | 894 |
| 895 $ hg branch thatbranch | 895 $ hg branch thatbranch |
| 896 marked working directory as branch thatbranch | 896 marked working directory as branch thatbranch |
| 897 (branches are permanent and global, did you want a bookmark?) | |
| 897 | 898 |
| 898 $ hg ci -m'new head' | 899 $ hg ci -m'new head' |
| 899 | 900 |
| 900 $ hg up default | 901 $ hg up default |
| 901 6 files updated, 0 files merged, 2 files removed, 0 files unresolved | 902 6 files updated, 0 files merged, 2 files removed, 0 files unresolved |