Mercurial > hg
comparison tests/test-subrepo.t @ 15623:fc8c7a5ccc4a
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 08 Dec 2011 16:01:44 -0600 |
| parents | e7119b091809 41885892796e |
| children | efdcce3fd2d5 |
comparison
equal
deleted
inserted
replaced
| 15622:86fc364ca5f8 | 15623:fc8c7a5ccc4a |
|---|---|
| 405 $ echo a > a | 405 $ echo a > a |
| 406 $ hg ci -Am1 | 406 $ hg ci -Am1 |
| 407 adding a | 407 adding a |
| 408 $ hg branch br | 408 $ hg branch br |
| 409 marked working directory as branch br | 409 marked working directory as branch br |
| 410 (branches are permanent and global, did you want a bookmark?) | |
| 410 $ echo a >> a | 411 $ echo a >> a |
| 411 $ hg ci -m1 | 412 $ hg ci -m1 |
| 412 $ hg up default | 413 $ hg up default |
| 413 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 414 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 414 $ echo b > b | 415 $ echo b > b |
| 455 $ hg ci -Am1 | 456 $ hg ci -Am1 |
| 456 adding .hgsub | 457 adding .hgsub |
| 457 committing subrepository s | 458 committing subrepository s |
| 458 $ hg branch br | 459 $ hg branch br |
| 459 marked working directory as branch br | 460 marked working directory as branch br |
| 461 (branches are permanent and global, did you want a bookmark?) | |
| 460 $ echo b > b | 462 $ echo b > b |
| 461 $ hg -R s up 3 | 463 $ hg -R s up 3 |
| 462 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 464 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 463 $ hg ci -Am1 | 465 $ hg ci -Am1 |
| 464 adding b | 466 adding b |