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

Re: Re: [Subclipse-users] Merge lost revisions

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 22 Apr 2011 11:17:24 -0400

On Fri, Apr 22, 2011 at 11:13 AM, Bruno Velly <bruno.velly_at_freesbee.fr> wrote:
> I guess I tried all possible methods for merging but nothing to do !!!

Subversion does not handle moves/renames. If you are using SVN 1.6
then you should have got a tree conflict to let you know that merge
could not handle this automatically and there might have been more for
you to do. In this case, merge the changes to the new location. 

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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.