tests/test-simplemerge.py.out
author Kostia Balytskyi <ikostia@fb.com>
Fri, 11 Nov 2016 07:01:27 -0800
changeset 30466 893be22cdb38
parent 22023 f18830651811
permissions -rw-r--r--
shelve: move unshelve-finishing logic to a separate function Finishing unshelve involves two steps now: - stripping a changelog - aborting a transaction Obs-based shelve will not require these things, so isolating this logic into a separate function where the normal/obs-shelve branching is going to be implemented seems to be like a nice idea. Behavior-wise this change moves 'unshelvecleanup' from being between changelog stripping and transaction abortion to being after them. I don't think this has any negative effects.

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK