Mercurial > hg-stable
comparison tests/test-backout.t @ 15623:fc8c7a5ccc4a
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 08 Dec 2011 16:01:44 -0600 |
| parents | 21766d5531cb 41885892796e |
| children | 6ef3107c661e |
comparison
equal
deleted
inserted
replaced
| 15622:86fc364ca5f8 | 15623:fc8c7a5ccc4a |
|---|---|
| 223 $ echo default > default | 223 $ echo default > default |
| 224 $ hg ci -d '0 0' -Am default | 224 $ hg ci -d '0 0' -Am default |
| 225 adding default | 225 adding default |
| 226 $ hg branch branch1 | 226 $ hg branch branch1 |
| 227 marked working directory as branch branch1 | 227 marked working directory as branch branch1 |
| 228 (branches are permanent and global, did you want a bookmark?) | |
| 228 $ echo branch1 > file1 | 229 $ echo branch1 > file1 |
| 229 $ hg ci -d '1 0' -Am file1 | 230 $ hg ci -d '1 0' -Am file1 |
| 230 adding file1 | 231 adding file1 |
| 231 $ hg branch branch2 | 232 $ hg branch branch2 |
| 232 marked working directory as branch branch2 | 233 marked working directory as branch branch2 |
| 234 (branches are permanent and global, did you want a bookmark?) | |
| 233 $ echo branch2 > file2 | 235 $ echo branch2 > file2 |
| 234 $ hg ci -d '2 0' -Am file2 | 236 $ hg ci -d '2 0' -Am file2 |
| 235 adding file2 | 237 adding file2 |
| 236 | 238 |
| 237 without --merge | 239 without --merge |