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

Re: Possible bug in subversion -

From: Duncan Booth <duncan.booth_at_suttoncourtenay.org.uk>
Date: 2007-01-19 10:10:14 CET

"Nick Black" <nickblack1@gmail.com> wrote:

> Comparing this to the code in Trac for the same project, the
> characters are not supposed to be there. Both of the checkouts were
> carried out from the same LAN - if this could be the problem?
>
> Anyway, I'd be interested to know what has cuased this,

Read the manual: the file in the working copy had been edited, and a
revision in the repository had an edit in the same part of the file. In
that situation subversion cannot automatically merge in the changes so it
marks them and lets you do it. Use 'svn status' to find which files are
conflicted and either 'svn resolved' or 'svn revert' as appropriate.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 19 10:10:57 2007

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