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

RE: Merging Practices

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-01-31 21:38:56 CET

-----Original Message-----
From: Sean Laurent [mailto:sean@neuronfarm.com]
Sent: Monday, January 31, 2005 3:25 PM
To: users@subversion.tigris.org
Subject: Re: Merging Practices

On Monday 31 January 2005 11:21 am, Dale Worley wrote:
> I suspect that this could be cured by updating your working copy as if
> (more or less) "svn copy -r B http://.../Template.fla ./Template.fla" had
> been done.

Unfortunately, it's definitely not as simple as updating my WC. I'm
absolutely positive I ran 'svn up' before doing the merge. However, I
this by checking out the branch at r810, attempted the merge and got the
set of conflicts (Template.fla is just one of many):

Sorry, what I meant was 'When Subversion detects the special case [described
previously], it not only updates the contents of the file in the WC to be
version B, it also sets the meta-information in the WC to be what would
result from "svn copy -r B http://.../Template.fla ./Template.fla".'


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 31 21:42:33 2005

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