Sat, 08 Oct 2011 14:18:18 -0500 backout: deprecate/hide support for backing out merges
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 14:18:18 -0500] rev 15211
backout: deprecate/hide support for backing out merges This has never worked usefully: - it can't undo a completely unwanted merge, as it leaves the merge in the DAG - it can't undo a faulty merge as that means doing a merge correctly, not simply reverting to one or the other parent Both of these kinds of merge also require coordinated action among developers to avoid the bad merge continuing to affect future merges, so we should stop pretending that backout is of any help here. As backing out a merge now requires a hidden option, it can't be done by accident, but will continue to 'work' for anyone who's already dependent on --parent for some unknown reason.
Sat, 08 Oct 2011 13:28:13 -0500 backout: add a note about not working on merges
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 13:28:13 -0500] rev 15210
backout: add a note about not working on merges
Sat, 08 Oct 2011 13:23:57 -0500 backout: mark some help verbose
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 13:23:57 -0500] rev 15209
backout: mark some help verbose
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip