[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Behaviour of "update" vs. "merge" w.r.t. tree changes (and tree conflicts)

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 18 Apr 2008 16:48:45 +0200

On Fri, Apr 18, 2008 at 03:24:20PM +0100, Julian Foad wrote:
> Yes, you're right. At present the code for detecting these WC
> inconsistencies is in the same place as that for detecting conflicts, which
> is making it a bit awkward to keep the two concepts separate. I'm not
> intending to move it to the state-report crawl, but in principle that might
> make sense.

This is one point Erik is addressing in his wc-ng notes,
if I understood correctly (albeit maybe not explicitly).

> (Such WC inconsistencies often consist of a node on disk that's unexpected
> or the wrong type, and then they are called "obstructions". A node missing
> from disk when it's expected to be there is another type.)
> I have been wondering whether tree-conflicts work should include detecting
> WC inconsistencies and even flagging them as a (distinguishable) type of
> conflict. Now that you've pointed out that we should be able to detect them
> much earlier, I'm seeing that that's a bad idea.

Yes, we should draw a line here.

> I'll just try to keep the two concepts logically separate for now, and not
> bother about obstructions/inconsistencies yet.

Good. Thanks for making me aware of this, too. It's nice to have
proper terms to use when talking about all this highly confusing
stuff :)

So now we have "tree conflicts", "obstructions", and "inconsistencies".
The latter is the new term of the week.

What muddies the waters a bit is that we actually do consider
obstructions to be tree conflicts, but we shouldn't consider
inconsistencies as tree conflicts (given that there are other
ways to deal with inconsistencies, as Mike pointed out).

Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on 2008-04-18 16:47:43 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.