Mercurial > hg
comparison tests/test-graft.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 | a387b0390082 |
children | 3cbb5bf4035d |
comparison
equal
deleted
inserted
replaced
23834:bf07c19b4c82 | 23835:aa4a1672583e |
---|---|
710 but do some destructive editing of the repo: | 710 but do some destructive editing of the repo: |
711 | 711 |
712 $ hg up -qC 7 | 712 $ hg up -qC 7 |
713 $ hg tag -l -r 13 tmp | 713 $ hg tag -l -r 13 tmp |
714 $ hg --config extensions.strip= strip 2 | 714 $ hg --config extensions.strip= strip 2 |
715 saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-backup.hg (glob) | 715 saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg (glob) |
716 $ hg graft tmp | 716 $ hg graft tmp |
717 skipping already grafted revision 8:9db0f28fd374 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f) | 717 skipping already grafted revision 8:9db0f28fd374 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f) |
718 [255] | 718 [255] |
719 | 719 |
720 Empty graft | 720 Empty graft |