Mercurial > hg
comparison tests/test-mq @ 9867:81f1462ef2c7
Allow import --no-commit over an applied MQ patch.
Since it only changes the working directory, it does not matter whether a patch is
applied. This change makes it easier to use hg import --no-commit instead of patch.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Mon, 16 Nov 2009 11:31:08 -0800 |
| parents | f2acc0c00bec |
| children | c51494c53841 |
comparison
equal
deleted
inserted
replaced
| 9861:0262bb59016f | 9867:81f1462ef2c7 |
|---|---|
| 173 echo foo >> ../a | 173 echo foo >> ../a |
| 174 hg diff > ../../import.diff | 174 hg diff > ../../import.diff |
| 175 hg revert --no-backup ../a | 175 hg revert --no-backup ../a |
| 176 hg import ../../import.diff | 176 hg import ../../import.diff |
| 177 hg st | 177 hg st |
| 178 echo % import --no-commit should succeed | |
| 179 hg import --no-commit ../../import.diff | |
| 180 hg st | |
| 181 hg revert --no-backup ../a | |
| 178 | 182 |
| 179 echo % qunapplied | 183 echo % qunapplied |
| 180 hg qunapplied | 184 hg qunapplied |
| 181 | 185 |
| 182 echo % qpush/qpop with index | 186 echo % qpush/qpop with index |