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

RE: Re: SVN Copy problem

From: Ram, Siddharth <sram_at_qualcomm.com>
Date: 2004-07-18 22:39:13 CEST

I can understand the out of date, but how is it a conflict ?
I'd appreciate any help in understand why SVN considers this a conflict,
and how I could work around it.

I can reproduce this problem quite easily now:

1. check out a tree (assume it is r10)
2. make changes to foo.c , commit to trunk
3. change working copy (add a line to foo.c)
4. create a branch (svn copy)using r10
5. switch to the branch
6. foo.c will be reported as being in conflict. Any change in the
working copy will show up as a conflict.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jul 18 22:39:36 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.