Mercurial > hg
comparison tests/test-clone-update-order.t @ 15615:41885892796e stable
branch: warn on branching
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 08 Dec 2011 14:32:44 -0600 |
parents | b00eda50ad2b |
children | 701df761aa94 |
comparison
equal
deleted
inserted
replaced
15610:09b200396384 | 15615:41885892796e |
---|---|
4 adding bar | 4 adding bar |
5 $ hg up -r null | 5 $ hg up -r null |
6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 6 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
7 $ hg branch mine | 7 $ hg branch mine |
8 marked working directory as branch mine | 8 marked working directory as branch mine |
9 (branches are permanent and global, did you want a bookmark?) | |
9 $ echo hello > world | 10 $ echo hello > world |
10 $ hg commit -Am hello | 11 $ hg commit -Am hello |
11 adding world | 12 adding world |
12 $ hg up -r null | 13 $ hg up -r null |
13 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 14 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
14 $ hg branch other | 15 $ hg branch other |
15 marked working directory as branch other | 16 marked working directory as branch other |
17 (branches are permanent and global, did you want a bookmark?) | |
16 $ echo good > bye | 18 $ echo good > bye |
17 $ hg commit -Am other | 19 $ hg commit -Am other |
18 adding bye | 20 adding bye |
19 $ hg up -r mine | 21 $ hg up -r mine |
20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 22 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |