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

Re: problem with simple use of 'svn merge'

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-04-24 06:18:21 CEST

On Apr 23, 2005, at 11:11 PM, Faheem Mitha wrote:

>
>
> On Sat, 23 Apr 2005, Ben Collins-Sussman wrote:
>
>> Thos 'skipped' messages mean that your belief about when the file
>> came into existence... is incorrect.
> [snip]
>
> I see. Thanks for the information. I'll take a more careful look. It
> would be really nice if I didn't have to work so hard at merging,
> though. I'd use branches more if I didn't have to try to keep track of
> all this stuff.

Like I said, find out when the branch was created ('svn log
--stop-on-copy'), and use that as the left-hand revision. Not
horrible.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Apr 24 06:20:31 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.