Show More
@@ -2550,7 +2550,7 b' def reposetup(ui, repo):' | |||||
2550 | repo.__class__ = mqrepo |
|
2550 | repo.__class__ = mqrepo | |
2551 |
|
2551 | |||
2552 | def mqimport(orig, ui, repo, *args, **kwargs): |
|
2552 | def mqimport(orig, ui, repo, *args, **kwargs): | |
2553 | if hasattr(repo, 'abort_if_wdir_patched'): |
|
2553 | if hasattr(repo, 'abort_if_wdir_patched') and not kwargs.get('no_commit', False): | |
2554 | repo.abort_if_wdir_patched(_('cannot import over an applied patch'), |
|
2554 | repo.abort_if_wdir_patched(_('cannot import over an applied patch'), | |
2555 | kwargs.get('force')) |
|
2555 | kwargs.get('force')) | |
2556 | return orig(ui, repo, *args, **kwargs) |
|
2556 | return orig(ui, repo, *args, **kwargs) |
@@ -175,6 +175,10 b' 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 |
@@ -154,6 +154,9 b' pushing to ../../k' | |||||
154 | abort: source has mq patches applied |
|
154 | abort: source has mq patches applied | |
155 | % import should fail |
|
155 | % import should fail | |
156 | abort: cannot import over an applied patch |
|
156 | abort: cannot import over an applied patch | |
|
157 | % import --no-commit should succeed | |||
|
158 | applying ../../import.diff | |||
|
159 | M a | |||
157 | % qunapplied |
|
160 | % qunapplied | |
158 | test2.patch |
|
161 | test2.patch | |
159 | % qpush/qpop with index |
|
162 | % qpush/qpop with index |
General Comments 0
You need to be logged in to leave comments.
Login now