Mercurial > hg-stable
comparison tests/test-impexp-branch.t @ 22485:efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 19 Sep 2014 14:51:58 -0500 |
| parents | db6b958c4f35 |
| children | 75be14993fda |
comparison
equal
deleted
inserted
replaced
| 22484:2b5940f64750 | 22485:efedda4aed49 |
|---|---|
| 52 applying ../r1.patch | 52 applying ../r1.patch |
| 53 $ cd .. | 53 $ cd .. |
| 54 | 54 |
| 55 $ hg init c | 55 $ hg init c |
| 56 $ cd c | 56 $ cd c |
| 57 $ hg import --exact --no-commit ../r0.patch | |
| 58 applying ../r0.patch | |
| 59 warning: can't check exact import with --no-commit | |
| 60 $ hg st | |
| 61 A rev | |
| 62 $ hg revert -a | |
| 63 forgetting rev | |
| 64 $ rm rev | |
| 57 $ hg import --exact ../r0.patch | 65 $ hg import --exact ../r0.patch |
| 58 applying ../r0.patch | 66 applying ../r0.patch |
| 59 $ hg import --exact ../r1.patch | 67 $ hg import --exact ../r1.patch |
| 60 applying ../r1.patch | 68 applying ../r1.patch |
| 61 | 69 |