You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Tracy R Reed <tr...@ultraviolet.org> on 2005/07/14 04:20:48 UTC
Repository corruption
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
svn, version 1.1.1 (r11581)
CentOS 4.0
fsfs storage
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
exit;
>>>>>>> .r1774
# get list ACCode
=======
}
}*/
# get list ACCode
>>>>>>> .r1777
Anyone know what's up with this? I have run svnadmin verify on the repo
and it reports no problems. I did migrate this repo from a bdb to fsfs
storage and in the process played some filter games that might have
screwed things up. I used svndumpfilter to rearrange some things and I
also ran a regex on the dump file to take a leading directory off of the
path of all of the files which was unwanted. I was pretty careful in how
I did it and consulted with a few people on the IRC channel but I think
that is the most likely source of the corruption. There is 527M of stuff
in the repo. Are there any other tools which can be used to consistancy
check and repair an svn repo?
Thanks!
- --
Tracy R Reed
http://ultraviolet.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFC1egg9PIYKZYVAq0RAkSZAJ92ihcxQW2bd4quqU5maONldqDDygCeM8kP
WU9F+aap2suSrSNcYwEC5L0=
=vlWm
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Repository corruption
Posted by Branko Čibej <br...@xbc.nu>.
Tracy R Reed wrote:
>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>svn, version 1.1.1 (r11581)
>CentOS 4.0
>
>fsfs storage
>
>I am occasionally seeing strange corruption in my checked out code
>consisting of things like:
>
><<<<<<< .mine
>
> }
><<<<<<< .mine
><<<<<<< .mine
>
>
[...]
This is not repository corruption. Someone got a conflict when they ran
"svn update", but they didn't bother to actually resolve it (that is,
they ran "svn resolved" without checking the file contents) before
committing.
PEBKC.
-- Brane
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Repository corruption
Posted by Tracy R Reed <tr...@ultraviolet.org>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Steve Williams wrote:
> Tracy R Reed wrote:
>
>> I am occasionally seeing strange corruption in my checked out code
>> consisting of things like:
>
> That's what Subversion does to a file when there is a merge conflict.
Ahhhhhh! Thank you Steve and Branko! I have not had reports from my
users of having run into the conflict scenario and I thought it would
not let you check in the change until the conflict was resolved so I am
surprised to check out code and still have those marks in it. I will go
around and investigate how my users are handling this and make sure they
actually resolve the conflicts. Now it all makes sense. *PHEW* I thought
perhaps I had somehow seriously fouled up my companies most valuable
asset! :)
- --
Tracy R Reed
http://ultraviolet.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFC1fN29PIYKZYVAq0RAjcdAJ433ruKBQ7pn2UbdOaDlMpuewT2IACfWjD3
C79YvvdKEOB1ilpFVaCVFjE=
=hbXL
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Repository corruption
Posted by Steve Williams <st...@kromestudios.com>.
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.