Jonathan Nieder <jrnieder@gmail.com> [Thu, 03 Feb 2011 00:27:44 -0600] rev 13340
backout: make help more explicit about what backout does
The help for backout explains:
The backout command merges the reverse effect of the reverted
changeset into the working directory.
Unfortunately, that does not make it obvious to a newcomer what the
backout command does. Since it performs a 3-way merge, what is the
common ancestor? Will the result be automatically committed? What is
this reverted changeset --- is it the rev passed with -r on the
command line or its inverse?
So try to clarify the description, avoiding jargon and being
explicit about what happens from the user's perspective.
Thanks to Gilles Moris, Steve Borho, Kevin Bullock, and timeless for
help.
trbs <trbs@trbs.net> [Fri, 04 Feb 2011 09:05:23 +0100] rev 13339
subrepo: fix pruning of subrepo filenames in dirstate (issue2619)
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:53:50 -0600] rev 13338
merge with self
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:52:25 -0600] rev 13337
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:30:13 -0600] rev 13336
Added signature for changeset 2b2155623ee2
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:30:09 -0600] rev 13335
Added tag 1.7.5 for changeset 2b2155623ee2
Matt Mackall <mpm@selenic.com> [Tue, 01 Feb 2011 17:29:38 -0600] rev 13334
merge with crew
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Feb 2011 21:59:07 +0100] rev 13333
Merge with stable