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

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

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Tue, 18 Nov 2008 07:23:48 +0100

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.

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


Received on 2008-11-18 07:24:26 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.