From: Karl Hasselström <kha@treskal.com>
Date: Sun, 21 Sep 2008 12:17:40 +0000 (+0200)
Subject: Log conflicts separately
X-Git-Tag: v0.15-rc1~146
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/a3d7efccc515eeb12001a46ea0b781133768b23c?hp=a3d7efccc515eeb12001a46ea0b781133768b23c

Log conflicts separately

This patch makes commands that produce a conflict log that final
conflicting push separately from the rest of the command's effects.
This makes it possible for the user to roll back just the final
conflicting push if she desires. (Rolling back the whole operation is
of course still possible, by resetting to the state yet another step
back in the log.)

This change only applies to the new-infrastructure commands.

Signed-off-by: Karl Hasselström <kha@treskal.com>
---