Log conflicts separately
authorKarl Hasselström <kha@treskal.com>
Sun, 21 Sep 2008 12:17:40 +0000 (14:17 +0200)
committerKarl Hasselström <kha@treskal.com>
Sun, 21 Sep 2008 12:19:07 +0000 (14:19 +0200)
commita3d7efccc515eeb12001a46ea0b781133768b23c
tree9b9b1c8ff8cda6850c786df0ad40d54813e6f016
parent3a3a4f2f9876f08f09d6bc6771cb951bba285375
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>
stgit/lib/transaction.py