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

Re: merge with unversioned obstructions still broken in 1.6?

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 13 Feb 2009 14:20:15 -0500

On Fri, Feb 13, 2009 at 2:14 PM, James Y Knight <foom_at_fuhm.net> wrote:
> On Feb 12, 2009, at 10:17 PM, Stefan Sperling wrote:
>> Yes, I think you really want issue #3101 fixed. It has not much
>> to do with tree conflicts. It really is about whether an obstruction
>> should be created during 'svn revert' of a locally added file with
>> history.
>
> Yes, I do want that fixed. :) Fixing it would get rid of probably 95%
> real life merge obstructions, and thus make fixing merge's "skip" mis-
> behavior less important.

I'd like to see this fixed too, but just thought I'd let you know that
we work-around this in the CollabNet Merge Client which is an
Eclipse-based GUI over merge tracking. We have an "Undo merge" option
that does a revert, then shows you the remaining unversioned items and
can remove them for you.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1152654
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-13 20:21:14 CET

This is an archived mail posted to the Subversion Users mailing list.