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

Re: SVN Copy problem

From: Martin Lie <martin.lie_at_broadpark.no>
Date: 2004-07-17 03:21:32 CEST

Ram, Siddharth wrote:
> That makes sense. However, it does not explain how I got the conflict
> - I followed exactly the steps below. I dont see how SVN could've
> decided that the same portion of the file was being edited
> simultaneously. I was doing the steps below sequential. My best guess
> is the branch being created from a non-head revision of trunk somehow
> bothered it?
> thanks
> -Siddharth

Let's say you copy trunk/foo.c as of r6 to branch/foo.c when HEAD is r8. As
the copy changes the repository, the revision number is incremented to 9.

You switch your working copy from trunk to branch, but the revision number
of your working copy foo.c doesn't change due to the switch (right?). So,
you've got for example a foo.c marked as being in synch with r7. When you
try to commit it, you'll get an error because you're trying to commit a file
that's out of date (7 < 9).

This would explain an out-of-date error, but not a _conflict_. Or perhaps
I'm way off here...

Martin Lie
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 17 03:21:53 2004

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.