Mercurial > public > mercurial-scm > hg
diff tests/test-histedit-edit.t @ 23835:aa4a1672583e
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 | a5168eb9b2bc |
| children | 11d72683f3de |
line wrap: on
line diff
--- a/tests/test-histedit-edit.t Mon Jan 12 18:01:20 2015 -0700 +++ b/tests/test-histedit-edit.t Fri Jan 09 10:52:14 2015 -0800 @@ -170,7 +170,7 @@ HG: branch 'default' HG: added f 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob) + saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-backup.hg (glob) $ hg status @@ -342,4 +342,4 @@ [1] $ HGEDITOR=true hg histedit --continue 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-backup.hg (glob) + saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob)