Mercurial > hg
comparison tests/test-rollback.t @ 15615:41885892796e stable
branch: warn on branching
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 08 Dec 2011 14:32:44 -0600 |
| parents | 0292f88d3b86 |
| children | fc8c7a5ccc4a |
comparison
equal
deleted
inserted
replaced
| 15610:09b200396384 | 15615:41885892796e |
|---|---|
| 39 $ hg commit -m'modify a' | 39 $ hg commit -m'modify a' |
| 40 | 40 |
| 41 Test issue 902 (current branch is preserved) | 41 Test issue 902 (current branch is preserved) |
| 42 $ hg branch test | 42 $ hg branch test |
| 43 marked working directory as branch test | 43 marked working directory as branch test |
| 44 (branches are permanent and global, did you want a bookmark?) | |
| 44 $ hg rollback | 45 $ hg rollback |
| 45 repository tip rolled back to revision 0 (undo commit) | 46 repository tip rolled back to revision 0 (undo commit) |
| 46 working directory now based on revision 0 | 47 working directory now based on revision 0 |
| 47 $ hg branch | 48 $ hg branch |
| 48 default | 49 default |
| 54 Test rollback of hg before issue 902 was fixed | 55 Test rollback of hg before issue 902 was fixed |
| 55 | 56 |
| 56 $ hg commit -m "test3" | 57 $ hg commit -m "test3" |
| 57 $ hg branch test | 58 $ hg branch test |
| 58 marked working directory as branch test | 59 marked working directory as branch test |
| 60 (branches are permanent and global, did you want a bookmark?) | |
| 59 $ rm .hg/undo.branch | 61 $ rm .hg/undo.branch |
| 60 $ hg rollback | 62 $ hg rollback |
| 61 repository tip rolled back to revision 0 (undo commit) | 63 repository tip rolled back to revision 0 (undo commit) |
| 62 named branch could not be reset: current branch is still 'test' | 64 named branch could not be reset: current branch is still 'test' |
| 63 working directory now based on revision 0 | 65 working directory now based on revision 0 |