Gmane
From: Stefano Tortarolo <stefano.tortarolo <at> gmail.com>
Subject: [PATCH] Disallow rollback after a rebase
Newsgroups: gmane.comp.version-control.mercurial.devel
Date: 2008-09-06 08:22:23 GMT (43 weeks, 3 hours and 3 minutes ago)
# HG changeset patch
# User Stefano Tortarolo <stefano.tortarolo <at> gmail.com>
# Date 1220689281 -7200
# Node ID 7d24449f89c035d68cdfe1e43aec44c6a363fabf
# Parent  4e62be0208d3465cf241d8fb6fb7c9ce125a490b
Disallow rollback after a rebase

diff -r 4e62be0208d3 -r 7d24449f89c0 hgext/rebase.py
--- a/hgext/rebase.py	Fri Sep 05 11:04:36 2008 +0200
+++ b/hgext/rebase.py	Sat Sep 06 10:21:21 2008 +0200
@@ -105,6 +105,8 @@

         clearstatus(repo)
         ui.status(_("rebase completed\n"))
+        if os.path.exists(repo.sjoin('undo')):
+            util.unlink(repo.sjoin('undo'))
         if skipped:
             ui.note(_("%d revisions have been skipped\n") % len(skipped))
     finally:
diff -r 4e62be0208d3 -r 7d24449f89c0 tests/test-rebase-parameters
--- a/tests/test-rebase-parameters	Fri Sep 05 11:04:36 2008 +0200
+++ b/tests/test-rebase-parameters	Sat Sep 06 10:21:21 2008 +0200
@@ -64,6 +64,9 @@
 hg update -C 5
 hg rebase 2>&1 | sed 's/\(saving bundle to \).*/\1/'

+echo "% Try to rollback after a rebase (fail)"
+hg rollback
+
 createrepo > /dev/null 2>&1
 echo
 echo "% Rebase with base == '.' => same as no arguments (from 3 onto 7)"
diff -r 4e62be0208d3 -r 7d24449f89c0 tests/test-rebase-parameters.out
--- a/tests/test-rebase-parameters.out	Fri Sep 05 11:04:36 2008 +0200
+++ b/tests/test-rebase-parameters.out	Sat Sep 06 10:21:21 2008 +0200
@@ -126,6 +126,8 @@
 adding file changes
 added 5 changesets with 5 changes to 5 files
 rebase completed
+% Try to rollback after a rebase (fail)
+no rollback information available

 % Rebase with base == '.' => same as no arguments (from 3 onto 7)
 3 files updated, 0 files merged, 3 files removed, 0 files unresolved