Mercurial > hg
comparison tests/test-merge8.t @ 50070:c8f32aa80dca
rollback: explicitly skip dirstate rollback when applicable
instead of letting the transaction logic overwrite the dirstate and then
overwrite that overwrite with a backup. We simply do not restore the dirstate
related file during the _playback call.
This open the way to removing the last dirstate guard usage.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 16 Feb 2023 10:00:59 +0100 |
parents | eb586ed5d8ce |
children |
comparison
equal
deleted
inserted
replaced
50069:81870c92c293 | 50070:c8f32aa80dca |
---|