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

RE: RE: Re: SVN Copy problem

From: Lee, Kevin <kdlee_at_qualcomm.com>
Date: 2004-07-19 21:05:23 CEST

The contents of the "conflicted" file seem strange to me as well. I
get:

<<<<<<< .mine
Local change to my WC...
=======
>>>>>>> .r10

This means I changed my local copy, but the version from the repository
had no conflicting contributions (i.e. the blank line).

Is there anyway to get SVN to not report this as a conflict?

Kevin

> -----Original Message-----
> From: Ram, Siddharth [mailto:sram@qualcomm.com]
> Sent: Sunday, July 18, 2004 1:39 PM
> To: Martin Lie; subversion mailing list (E-mail)
> Subject: RE: Re: SVN Copy problem
>
> 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.
>
>
>
> Thanks
> Siddharth
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 19 21:06:45 2004

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