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:
This is one point Erik is addressing in his wc-ng notes,
> (Such WC inconsistencies often consist of a node on disk that's unexpected
Yes, we should draw a line here.
> I'll just try to keep the two concepts logically separate for now, and not
Good. Thanks for making me aware of this, too. It's nice to have
So now we have "tree conflicts", "obstructions", and "inconsistencies".
What muddies the waters a bit is that we actually do consider
-- 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
This is an archived mail posted to the Subversion Dev mailing list.