comparison tests/test-rebase-abort.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 2fb0504b8175
children 01ad8daae5be
comparison
equal deleted inserted replaced
23834:bf07c19b4c82 23835:aa4a1672583e
70 [1] 70 [1]
71 71
72 Abort: 72 Abort:
73 73
74 $ hg rebase --abort 74 $ hg rebase --abort
75 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-backup.hg (glob) 75 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg (glob)
76 rebase aborted 76 rebase aborted
77 77
78 $ hg tglog 78 $ hg tglog
79 @ 4:draft 'L2' 79 @ 4:draft 'L2'
80 | 80 |