Mercurial > public > mercurial-scm > hg-stable

diff tests/test-rebase-check-restore.t @ 23835:aa4a1672583e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundles: do not overwrite existing backup bundles (BC) Previously, a backup bundle could overwrite an existing bundle and cause user data loss. For instance, if you have A<-B<-C and strip B, it produces backup bundle B-backup.hg. If you then hg pull -r B B-backup.hg and strip it again, it overwrites the existing B-backup.hg and C is lost. The fix is to add a hash of all the nodes inside that bundle to the filename. Fixed up existing tests and added a new test in test-strip.t
author Durham Goode <durham@fb.com>
date Fri, 09 Jan 2015 10:52:14 -0800
parents 4f18e80d9c30
children ef1eb6df7071
line wrap: on
line diff
--- a/tests/test-rebase-check-restore.t	Mon Jan 12 18:01:20 2015 -0700
+++ b/tests/test-rebase-check-restore.t	Fri Jan 09 10:52:14 2015 -0800
@@ -138,7 +138,7 @@
   (no more unresolved files)
   $ hg rebase --continue
   rebasing 5:01e6ebbd8272 "F" (tip)
-  saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-backup.hg (glob)
+  saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob)
 
   $ hg tglog
   @  5:draft 'F' notdefault