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

Re: Issue #3320 -- was: Re: Tree conflicts - What's To Do?

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Wed, 19 Nov 2008 06:56:44 +0100

Julian Foad wrote:
> On Tue, 2008-11-18 at 07:23 +0100, Neels J. Hofmeyr wrote:
>> Neels J. Hofmeyr wrote:
>>> Making comments inline...
>>> Julian Foad wrote:
>>>> We all want to know what's left to do for tree conflicts. Here's the
>>>> best list I can make today. There are some obviously-blocking issues,
>>>> and there's lots more stuff we'd like to do but won't for 1.6, and there
>>>> are questions of usability.
>>>> =====
>>>> #3320: Commit not blocked by tree conflict
>>> This is very severe. Will try to look at this one next.
>> Fixed in r34247. A "remains in conflict" error is now reported when
>> recursing onto tree-conflict victims that have no entry.
> That's fantastic, Neels. Thanks ever so much.

(pasted from another thread:)
> A couple of minor issues remain with it,
> but no longer a severe issue.

All issues (hopefully) resolved in r34266.

>> When a victim that has no entry is an explicit target, the error "is not
>> under version control" is still issued. Utterly low priority.
> Agreed.
> - Julian

Fixed it anyway in r34267. It was at hand and quick to do.

I guess we can close #3320.


Received on 2008-11-19 06:57:07 CET

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.