##// END OF EJS Templates
strip: report both bundle files in case of exception (issue5368)...
Martin von Zweigbergk -
r29952:44ef2162 default
parent child Browse files
Show More
@@ -230,7 +230,7 b' def strip(ui, repo, nodelist, backup=Tru'
230 230 if backupfile:
231 231 ui.warn(_("strip failed, full bundle stored in '%s'\n")
232 232 % vfs.join(backupfile))
233 elif chgrpfile:
233 if chgrpfile:
234 234 ui.warn(_("strip failed, partial bundle stored in '%s'\n")
235 235 % vfs.join(chgrpfile))
236 236 raise
@@ -367,11 +367,50 b' 2 is parent of 3, only one strip should '
367 367 date: Thu Jan 01 00:00:00 1970 +0000
368 368 summary: a
369 369
370 Failed hook while applying "saveheads" bundle.
371
372 $ hg strip 2 --config hooks.pretxnchangegroup.bad=false
373 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
374 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
375 transaction abort!
376 rollback completed
377 strip failed, full bundle stored in '$TESTTMP/test/.hg/strip-backup/*-backup.hg' (glob)
378 strip failed, partial bundle stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob)
379 abort: pretxnchangegroup.bad hook exited with status 1
380 [255]
381 $ restore
382 $ hg log -G
383 o changeset: 4:443431ffac4f
384 | tag: tip
385 | user: test
386 | date: Thu Jan 01 00:00:00 1970 +0000
387 | summary: e
388 |
389 o changeset: 3:65bd5f99a4a3
390 | parent: 1:ef3a871183d7
391 | user: test
392 | date: Thu Jan 01 00:00:00 1970 +0000
393 | summary: d
394 |
395 | o changeset: 2:264128213d29
396 |/ user: test
397 | date: Thu Jan 01 00:00:00 1970 +0000
398 | summary: c
399 |
400 @ changeset: 1:ef3a871183d7
401 | user: test
402 | date: Thu Jan 01 00:00:00 1970 +0000
403 | summary: b
404 |
405 o changeset: 0:9ab35a2d17cb
406 user: test
407 date: Thu Jan 01 00:00:00 1970 +0000
408 summary: a
409
370 410
371 411 2 different branches: 2 strips
372 412
373 413 $ hg strip 2 4
374 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
375 414 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
376 415 $ hg log -G
377 416 o changeset: 2:65bd5f99a4a3
General Comments 0
You need to be logged in to leave comments. Login now