##// END OF EJS Templates
rebase: clean up rebasestate from active transaction...
rebase: clean up rebasestate from active transaction Previously, rebase assumes the following pattern: rebase: with transaction as tr: # top-level ... tr.__close__ writes rebasestate unlink('rebasestate') However it's possible that "rebase" was called inside a transaction: with transaction as tr1: rebase: with transaction as tr2: # not top-level ... tr2.__close__ does not write rebasestate unlink('rebasestate') tr1.__close__ writes rebasestate That leaves a rebasestate on disk incorrectly. This patch adds "removefilegenerator" to notify transaction code that the state file is no longer needed therefore fixes the issue.

File last commit:

r22023:f1883065 default
r33056:2312e70c default
Show More
test-simplemerge.py.out
5 lines | 115 B | text/plain | TextLexer
/ tests / test-simplemerge.py.out
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 ................
Alexis S. L. Carvalho
actually port simplemerge to hg...
r4363 ----------------------------------------------------------------------
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 Ran 16 tests in 0.000s
Alexis S. L. Carvalho
actually port simplemerge to hg...
r4363
OK