Mercurial > hg-stable
diff tests/test-histedit-fold-non-commute.t @ 17644:9ae073f10572
histedit: fold in memory
Update the folding code to works in memory instead of applying patches on the
working directory. This is cleaner, faster and prepare the removal of the whole
patching logic.
This new collapse function will probably move into core sooner or later. A lot
of other rewriting operation may benefit from it.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Fri, 21 Sep 2012 19:24:31 +0200 |
| parents | c2f13180001f |
| children | d44731a3adb8 |
line wrap: on
line diff
--- a/tests/test-histedit-fold-non-commute.t Fri Sep 21 00:33:30 2012 +0200 +++ b/tests/test-histedit-fold-non-commute.t Fri Sep 21 19:24:31 2012 +0200 @@ -92,6 +92,17 @@ + HG: Enter commit message. Lines beginning with 'HG:' are removed. + HG: Leave message empty to abort commit. + HG: -- + HG: user: test + HG: branch 'default' + HG: changed d + HG: changed e + + + + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved file e already exists 1 out of 1 hunks FAILED -- saving rejects to file e.rej