Mercurial > hg-stable
comparison tests/test-import-bypass.t @ 15623:fc8c7a5ccc4a
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 08 Dec 2011 16:01:44 -0600 |
parents | db0340f4b507 41885892796e |
children | 0e0060bf2f44 |
comparison
equal
deleted
inserted
replaced
15622:86fc364ca5f8 | 15623:fc8c7a5ccc4a |
---|---|
16 $ hg ci -Am adda | 16 $ hg ci -Am adda |
17 adding a | 17 adding a |
18 $ echo a >> a | 18 $ echo a >> a |
19 $ hg branch foo | 19 $ hg branch foo |
20 marked working directory as branch foo | 20 marked working directory as branch foo |
21 (branches are permanent and global, did you want a bookmark?) | |
21 $ hg ci -Am changea | 22 $ hg ci -Am changea |
22 $ hg export . > ../test.diff | 23 $ hg export . > ../test.diff |
23 $ hg up null | 24 $ hg up null |
24 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
25 | 26 |