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

Re: [PATCH] tree conflicts and obstructions

From: Senthil Kumaran S <senthil_at_collab.net>
Date: Thu, 03 Apr 2008 13:11:29 +0530

Hi Stefan,

Stefan Sperling wrote:
> here's my first shot at tree conflicts and obstructions.
> I'm posting this here mainly for review and testing by
> Julian and Senthil, but if anyone else wants to take a
> peek, go right ahead :)

I am ok with this patch.

Just for the record am summarizing our IRC conversation here:

As we (stsp, julianfoad and myself) discussed yesterday in IRC, we need to have
a notification to the user about the tree conflict victim, since otherwise it
goes unnoticed except for the 'C' notification in the (tree)conflicted
directory, but the exact files ie., the tree conflict victim is not known to
the user at a first look, unless he does a 'svn info'. Currently it is
'Skipped' in your patch. It can be 'Obstructed' during the notification. If
that is the case the merge_test 92 should be changed accordingly to handle this
notification. But there is another problem of 'what to show in 'svn status' for
these tree conflict victims via obstruction.

Senthil Kumaran S
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-03 09:41:54 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.