Mercurial > hg
comparison tests/test-subrepo-git.t @ 16271:63a1bed65fa3
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 18 Mar 2012 18:21:58 -0500 |
| parents | b254f827b7a6 0628290d98df |
| children | 17a1f7690b49 |
comparison
equal
deleted
inserted
replaced
| 16267:aa6821a7b52f | 16271:63a1bed65fa3 |
|---|---|
| 480 $ git rev-parse HEAD | 480 $ git rev-parse HEAD |
| 481 aa84837ccfbdfedcdcdeeedc309d73e6eb069edc | 481 aa84837ccfbdfedcdcdeeedc309d73e6eb069edc |
| 482 $ cd .. | 482 $ cd .. |
| 483 | 483 |
| 484 Sticky repository, update --clean | 484 Sticky repository, update --clean |
| 485 $ hg update --clean tip | 485 $ hg update --clean tip 2>/dev/null |
| 486 Previous HEAD position was aa84837... f | |
| 487 HEAD is now at 32a3438... fff | |
| 488 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 486 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 489 $ hg id -n | 487 $ hg id -n |
| 490 7 | 488 7 |
| 491 $ cd s | 489 $ cd s |
| 492 $ git rev-parse HEAD | 490 $ git rev-parse HEAD |