##// END OF EJS Templates
mq: warn when applying a patch to somewhere other than tip
Matt Mackall -
r6340:949e607a default
parent child Browse files
Show More
@@ -766,6 +766,9 b' class queue:'
766 def push(self, repo, patch=None, force=False, list=False,
766 def push(self, repo, patch=None, force=False, list=False,
767 mergeq=None):
767 mergeq=None):
768 wlock = repo.wlock()
768 wlock = repo.wlock()
769 if repo.dirstate.parents()[0] != repo.lookup("tip"):
770 self.ui.status(_("(working directory not at tip)\n"))
771
769 try:
772 try:
770 patch = self.lookup(patch)
773 patch = self.lookup(patch)
771 # Suppose our series file is: A B C and the current 'top'
774 # Suppose our series file is: A B C and the current 'top'
@@ -332,6 +332,7 b' adding manifests'
332 adding file changes
332 adding file changes
333 added 1 changesets with 1 changes to 1 files
333 added 1 changesets with 1 changes to 1 files
334 Patch queue now empty
334 Patch queue now empty
335 (working directory not at tip)
335 applying bar
336 applying bar
336 Now at: bar
337 Now at: bar
337 diff --git a/bar b/bar
338 diff --git a/bar b/bar
@@ -365,6 +366,7 b' adding manifests'
365 adding file changes
366 adding file changes
366 added 1 changesets with 1 changes to 1 files
367 added 1 changesets with 1 changes to 1 files
367 Patch queue now empty
368 Patch queue now empty
369 (working directory not at tip)
368 applying bar
370 applying bar
369 Now at: bar
371 Now at: bar
370 diff --git a/foo b/bleh
372 diff --git a/foo b/bleh
General Comments 0
You need to be logged in to leave comments. Login now