Mercurial > public > mercurial-scm > hg-stable
diff tests/test-hgweb-bundle.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 | c39d404f0eb0 |
| children | 4d2b9b304ad0 |
line wrap: on
line diff
--- a/tests/test-hgweb-bundle.t Mon Jan 12 18:01:20 2015 -0700 +++ b/tests/test-hgweb-bundle.t Fri Jan 09 10:52:14 2015 -0800 @@ -18,11 +18,11 @@ $ hg strip -r 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-backup.hg (glob) + saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg (glob) Serve from a bundle file - $ hg serve -R .hg/strip-backup/ed602e697e0f-backup.hg -d -p $HGPORT --pid-file=hg.pid + $ hg serve -R .hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg -d -p $HGPORT --pid-file=hg.pid $ cat hg.pid >> $DAEMON_PIDS Ensure we're serving from the bundle