On 2008-03-20 15:19:12 +0000, Catalin Marinas wrote:

quoted text
> As I wrote on the patch system, I'd like to put back the explicit
> --keep option in goto.

There are three possible values of "keepiness":

  1. Make sure there are _no_ local changes. (Default for old
     infrastructure.)

  2. Make sure there are no local changes in the files we need to
     touch. (Default for new infrastructure.)

  3. Bring along local changes by means of a merge. (What the --keep
     option does.)

git defaults to doing (2), and optionally does (3). (1) is
significantly slower than (2); I don't know how slow (3) is.

There are two questions: what subset of these options do we support,
and which of the supported modes should be the default?

I think that (2) should be the default, because it's faster, it's what
git does, and I don't really see the point in complaining about local
changes in a file we won't need to touch anyway. Having an option for
(3) might be handy, though.

But I gather you want (1) to be the default (with (3) as an option).
Correct?

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html