Mercurial > hg
diff tests/test-histedit-fold.t @ 24771:3133e246c912
histedit: convert fold/roll actions into a class
This converts the fold/roll actions into a histeditclass instance, as part of an
ongoing effort to refactor histedit for maintainability and robustness.
The tests changed for two reasons:
1) We get a new 'empty changeset' warning because we now warn more consistently
between normal histedit and --continue about commits disappearing.
2) Previously we were not putting the histedit-source extra field on the
temporary fold commit during normal runs, but we were on --continue runs. By
unifying these code paths we now consistently put histedit-source on the
temporary fold commit, which changes some of the hashes in the backup bundles.
author | Durham Goode <durham@fb.com> |
---|---|
date | Sat, 04 Apr 2015 02:03:27 -0700 |
parents | aa4a1672583e |
children | 5045a003260b |
line wrap: on
line diff
--- a/tests/test-histedit-fold.t Sat Apr 04 01:00:51 2015 -0700 +++ b/tests/test-histedit-fold.t Sat Apr 04 02:03:27 2015 -0700 @@ -307,6 +307,7 @@ $ hg resolve --mark file (no more unresolved files) $ hg histedit --continue + 251d831eeec5: empty changeset 0 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/*-backup.hg (glob) $ hg logt --graph