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

Re: Is merge broken?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-04-03 15:41:57 CEST

On Apr 3, 2005, at 5:35 AM, Ignacy Gawedzki wrote:

> On Sat, Apr 02, 2005 at 10:04:27PM -0600, thus spake Ben
> Collins-Sussman:
>>
>> On Apr 2, 2005, at 8:34 PM, Ignacy Gawedzki wrote:
>>
>>>
>>> svn merge -r3:5 somebranch trunk
>>>
>>
>> You want to compare the inital and final snapshots of the branch;
>> you're not doing that. The initial branch state is in r2, not r3.
>
> I just tried that and it spits exactly the same error.
>

What version of svn? Can you send us a script that demonstrates the
error?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Apr 3 15:45:37 2005

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

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