changeset 3076:1a792e4a1f3a

merge with brendan
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 09 Sep 2006 12:51:05 +0200
parents e20e7e2623b0 (diff) be98c5ce4022 (current diff)
children ad6aecaf4eed
files hgext/mq.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/mq.py	Mon Aug 28 16:30:48 2006 -0500
+++ b/hgext/mq.py	Sat Sep 09 12:51:05 2006 +0200
@@ -694,8 +694,8 @@
         stripall(rev, revnum)
 
         change = chlog.read(rev)
+        chlog.strip(revnum, revnum)
         repo.manifest.strip(repo.manifest.rev(change[0]), revnum)
-        chlog.strip(revnum, revnum)
         if saveheads:
             self.ui.status("adding branch\n")
             commands.unbundle(self.ui, repo, chgrpfile, update=False)