[vlc-devel] Bad merge in po/

[Rémi Denis-Courmont]

Le Friday 23 November 2007 20:42:14 Alex Suter, vous avez écrit :
> This might be old news, but yesterday's Subversion sync had
> several problem files in the po/ directory. It looks like someone
> merged in some changes that conflicted and didn't completely
> resolve it before checking in.

SVN does not allow merging files with conflicts. In fact, you cannot a file if 
the patch is not against the HEAD revision. At worst, if the committer is 
really badly educated, he will overwrite the HEAD revision with his/her 
version, but that would compute the (probably large) diff between HEAD and 
said version. Still, no conflicts.

If you have conflicts; it means you (or your build system) modified the files 
locally.

-- 
Rémi Denis-Courmont
http://www.remlab.net/