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

Re: very strange merge behavior

From: John Joseph Bachir <johnjosephbachir_at_gmail.com>
Date: 2006-07-07 19:42:46 CEST

Okay, false alarm due to a miscommunication with my colleague, the
merge actually went as expected. Sorry for the list clutter.

On 7/7/06, John Joseph Bachir <johnjosephbachir@gmail.com> wrote:
> Hello folks. I thought I understood merge quite swimmingly, but just
> now I merged in changes from a branch into trunk and it
> _comprehensively_ deleted all changes that we had made to trunk since
> the branch!
>
> Here is the command i used:
>
> cd path/to/trunk
>
> svn merge -r 812:HEAD http://source.ibiblio.org/svn/lyceum/branches/0.32
>
> Any ideas?
> --
> http://lyceum.ibiblio.org
>

-- 
http://lyceum.ibiblio.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 7 19:44:14 2006

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