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

Re: [Subclipse-users] Merge lost revisions

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 22 Apr 2011 14:18:21 -0400

On Fri, Apr 22, 2011 at 2:13 PM, Bruno Velly <bruno.velly_at_freesbee.fr> wrote:
> Hello, and thank you for trying to help me!
>
> The problem, in that case, is that there is no tree conflict (see attached file).

Is the server 1.6 and did you get as far as committing successfully?

It is ultimately up to Subversion to create the tree conflict so there
is not much we can do about it. Maybe this is a scenario where it
cannot detect them. I thought it could, but it seems like maybe it
cannot.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2722805
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2011-04-22 20:18:20 CEST

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