[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: Sean Laurent <sean_at_neuronfarm.com>
Date: 2005-02-01 19:04:54 CET

On Monday 31 January 2005 02:38 pm, Dale Worley wrote:
> On Monday 31 January 2005 3:25 pm, Sean Laurent wrote:
> 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
> tested
> this by checking out the branch at r810, attempted the merge and got the
> same
> 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".'

Hrmmm. Except that some of the conflicts I get are for files that did not
change between revision A and revision B... only between B and D.

So... I'm still confused.


It's just going to be one of those weeks, I guess.

Everyone has a photographic memory. Some don't have film.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 1 19:07:25 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.