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

Re: [RFC] Property conflicts should save old/theirs/mine versions

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 22 Jul 2008 18:37:38 +0100

On Tue, 2008-07-22 at 17:56 +0100, Julian Foad wrote:
> On Tue, 2008-07-22 at 14:52 +0100, Julian Foad wrote:
> > Now, that's still quite a bit of work and may well be too much to bite
> > off now (though large chunks of it are temptingly easy). But I think we
> > need to be considering moves like this, and to something in this
> > direction sooner or later.
>
> For anyone interested, the attached patch contains my work in progress
> on this.

Of course, I know how unfriendly is a patch without a log message.
That's one thing I owe you, and the other is a description of the
concept of the WC's "mine" and "old" and "new" versions in terms of what
their behaviour should be expected to look like in comparison to the
"working" and "base" versions.

I'll write something about that, but at the same time I think I should
step back from pursuing this line for the moment and more importantly
look at what of the earlier phases of tree conflict detection can be
brought out into the daylight of "trunk".

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-22 19:38:00 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.