D3756: rebase: no need to backup rebased csets while aborting
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Sat Jun 16 13:47:12 UTC 2018
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3756
AFFECTED FILES
hgext/rebase.py
tests/test-rebase-abort.t
CHANGE DETAILS
diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t
+++ b/tests/test-rebase-abort.t
@@ -115,7 +115,6 @@
Abort (should clear out unsupported merge state):
$ hg rebase --abort
- saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg
rebase aborted
$ hg debugmergestate
no merge state found
@@ -406,7 +405,6 @@
[255]
$ hg rebase --abort
- saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
rebase aborted
$ hg log -G --template "{rev} {desc} {bookmarks}"
o 6 no-a
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1573,7 +1573,7 @@
# Strip from the first rebased revision
if rebased:
# no backup of rebased cset versions needed
- repair.strip(repo.ui, repo, strippoints)
+ repair.strip(repo.ui, repo, strippoints, backup=False)
if activebookmark and activebookmark in repo._bookmarks:
bookmarks.activate(repo, activebookmark)
To: khanchi97, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list