[vlc-devel] Re: vlc: svn commit r17288 (funman)

[Rafaël Carré]

Le Fri, 27 Oct 2006 09:27:06 +0300,
Rémi Denis-Courmont <rdenis at simphalempin.com> a écrit :

> On Thu, Oct 26, 2006 at 11:48:05PM +0200, Rafaël Carré wrote :
> > also i worked on 0.8.6 because it uses the same file than trunk, and
> > applied the diff to 0.8.6, and then to trunk, this is why i used the
> > word "frontport"
> 
> It did NOT. The files were not in sync. Any attempt to merge a diff
> from 0.8.6 to trunk would have yielded phony error messages, or, if
> you hadn't updated your trunk, would have banned you from commiting.
> 

[fun at zod ~]% svn cat -r 17286
svn://svn.videolan.org/vlc/trunk/modules/gui/wxwidgets/wxwidgets.hpp >
trunk
[fun at zod ~]% svn cat -r 17286
svn://svn.videolan.org/vlc/branches/0.8.6/modules/gui/wxwidgets/wxwidgets.hpp
> branch 
[fun at zod ~]% diff branch trunk
5c5
<  * $Id: wxwidgets.hpp 17262 2006-10-22 19:09:06Z Trax $
---
>  * $Id: wxwidgets.hpp 17259 2006-10-22 15:45:16Z funman $
163,166d162
< class DialogsProvider;
< class PrefsTreeCtrl;
< class AutoBuiltPanel;
< 
[fun at zod ~]% 

-- 
Rafaël Carré
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20061027/ad5509f8/attachment.sig>