[vlc-devel] Compile Error...

Rafaël Carré funman at videolan.org
Thu Feb 7 10:33:26 CET 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Tony Anecito a écrit :
> Okay I fixed this one and found that subversion was
> adding the <<<<<mine. which caused compiles to break.
> If there are any changes previously in the file like
> what I had during debugging of an issue long ago then
> subversion will add these extra lines which causes the
> make to break.

When you run "svn up", if any of the files is prefixed with the letter
"C", that means there is a *C*onflict, so you have to resolve the
conflict by yourself.

A solution is to run svn revert XXX/file.problem so it is in the
original state (not modified).


- --
Rafaël Carré
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkeq0GYACgkQYWCeGMCv8Q+MKwCfWXojRnLeCOLyzssq4NnzxEsf
1EkAn3wHyUuTp464k30yrzH6xvuJeU1F
=Y872
-----END PGP SIGNATURE-----
_______________________________________________
vlc-devel mailing list
To unsubscribe or modify your subscription options:
http://mailman.videolan.org/listinfo/vlc-devel



More information about the vlc-devel mailing list