Show More
@@ -885,8 +885,8 b' class queue:' | |||
|
885 | 885 | def push(self, repo, patch=None, force=False, list=False, |
|
886 | 886 | mergeq=None, all=False): |
|
887 | 887 | wlock = repo.wlock() |
|
888 |
if repo.dirstate.parents()[0] |
|
|
889 |
self.ui.status(_("(working directory not at |
|
|
888 | if repo.dirstate.parents()[0] not in repo.heads(): | |
|
889 | self.ui.status(_("(working directory not at a head)\n")) | |
|
890 | 890 | |
|
891 | 891 | if not self.series: |
|
892 | 892 | self.ui.warn(_('no patches in series\n')) |
@@ -19,6 +19,5 b' 1 files updated, 0 files merged, 0 files' | |||
|
19 | 19 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 20 | % merge |
|
21 | 21 | merging with queue at refqueue |
|
22 | (working directory not at tip) | |
|
23 | 22 | applying patcha |
|
24 | 23 | now at: patcha |
@@ -326,7 +326,7 b' adding manifests' | |||
|
326 | 326 | adding file changes |
|
327 | 327 | added 1 changesets with 1 changes to 1 files |
|
328 | 328 | patch queue now empty |
|
329 |
(working directory not at |
|
|
329 | (working directory not at a head) | |
|
330 | 330 | applying bar |
|
331 | 331 | now at: bar |
|
332 | 332 | diff --git a/bar b/bar |
@@ -360,7 +360,7 b' adding manifests' | |||
|
360 | 360 | adding file changes |
|
361 | 361 | added 1 changesets with 1 changes to 1 files |
|
362 | 362 | patch queue now empty |
|
363 |
(working directory not at |
|
|
363 | (working directory not at a head) | |
|
364 | 364 | applying bar |
|
365 | 365 | now at: bar |
|
366 | 366 | diff --git a/foo b/bleh |
General Comments 0
You need to be logged in to leave comments.
Login now