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

SVN Copy problem

From: Ram, Siddharth <sram_at_qualcomm.com>
Date: 2004-07-16 22:20:23 CEST

I'm getting a conflict where I do not expect to get a conflict. Here's
the situation (done using the Perl API)
 
1. I create a file foo.c , add and commit it to trunk
 
2. I make some changes in foo and commit it back to trunk.
 
3. I make some more changes in the working copy.
 
4. I decide to save working copy changes in a branch. So first I create
a pristine copy of trunk using (the perl API equivalent of)
 
svn copy -r 6 http://svn/rep/trunk/foo.c http://svn/rep/branch/foo.c
 
(where the revision is not the head )
 
5. I switch to the branch
 
6. I commit my changes, expecting that my working copy changes to rev 6
would get commited to the branch. Instead , I get a merge conflict !
 
How could be happening to do this? If SVN sees changes all by the same
user, it should never declare a conflict, right ?
 
thanks
Siddharth
Received on Fri Jul 16 22:20:58 2004

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