[vlc-devel] Bad merge in po/

[Alex Suter]

Thanks Felix (and others), it's working great now. Builds like a dream.

                          -- Alex

On Nov 23, 2007 4:46 PM, Felix Paul Kühne
<fkuehne.videolan at googlemail.com> wrote:
> Alex,
>
> Subversion sometimes got problems with my po file commits and merges
> them badly in existing checkouts. Please just rm -rf po in your vlc
> trunk and svn up again. This way, you get the complete po files which
> work flawlessly.
>
> Best,
> Felix
>
>
>
> On 23.11.2007, at 19:42, Alex Suter wrote:
>
> > Hey all,
> >
> > 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.
> >
> > It's an easy fix, but I didn't want to break anything by going with
> > the wrong changes.
> >
> > Thanks,
> > Alex
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > http://mailman.videolan.org/listinfo/vlc-devel
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>