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

Re: Repository corruption

From: Steve Williams <stevewilliams_at_kromestudios.com>
Date: 2005-07-14 06:27:32 CEST

Tracy R Reed wrote:
> I am occasionally seeing strange corruption in my checked out code
> consisting of things like:
>
> <<<<<<< .mine
>
> }
> <<<<<<< .mine
> <<<<<<< .mine
>
> =======
> print_r ($arCC);
> =======
> print_r($arCC);
>
>>>>>>>>.r1775

That's what Subversion does to a file when there is a merge conflict.
Someone else edited the same lines as you and has already committed
their version. It is up to you to resolve the conflict before you
commit the file.

See this chapter in the SVN book on resolving conflicts.
http://svnbook.red-bean.com/en/1.1/ch03s05.html#svn-ch-3-sect-5.4

-- 
Sly
This message and its attachments may contain legally privileged or confidential information. This message is intended for the use of the individual or entity to which it is addressed. If you are not the addressee indicated in this message, or the employee or agent responsible for delivering the message to the intended recipient, you may not copy or deliver this message or its attachments to anyone. Rather, you should permanently delete this message and its attachments and kindly notify the sender by reply e-mail. Any content of this message and its attachments, which does not relate to the official business of the sending company must be taken not to have been sent or endorsed by the sending company or any of its related entities. No warranty is made that the e-mail or attachment(s) are free from computer virus or other defect.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 14 06:29:03 2005

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