comparison 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
comparison
equal deleted inserted replaced
17643:64e0f0cfb569 17644:9ae073f10572
90 *** 90 ***
91 does not commute with e 91 does not commute with e
92 92
93 93
94 94
95 HG: Enter commit message. Lines beginning with 'HG:' are removed.
96 HG: Leave message empty to abort commit.
97 HG: --
98 HG: user: test
99 HG: branch 'default'
100 HG: changed d
101 HG: changed e
102
103
104
105 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
96 file e already exists 107 file e already exists
97 1 out of 1 hunks FAILED -- saving rejects to file e.rej 108 1 out of 1 hunks FAILED -- saving rejects to file e.rej
98 abort: Fix up the change and run hg histedit --continue 109 abort: Fix up the change and run hg histedit --continue
99 110