yade-dev team mailing list archive

[Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>]

Here is the trick for applying diffs one by one (not always needed ofc):
1- checkout the current trunk
2- compare with your local version with "kompare local-trunk fresh-trunk"
3- browse diffs and apply/revert them one by one
4- commit fresh-trunk wich now includes the "applied" diffs

Reveting some local changes is also possible by inverting source and 
target like in "kompare fresh-trunk local-trunk".

B.




On 08/07/10 11:28, Janek Kozicki wrote:
> Anton Gladky said:     (by the date of Thu, 8 Jul 2010 11:18:57 +0200)
>    
> > > Václav Šmilauer said:     (by the date of Thu, 08 Jul 2010 10:36:29 +0200)
> > >        
> > > > bzr qdiff
> > > >          
> > > wow. it rules!
> > >        
>    
> > Thanks also Vaclav from me!
> >
> > Actually, according to Vaclav's previous advices, I use also "htop" and
> > "terminator", it is a really good programs.
> >      
> wow terminator is great! thanks!
>
> About htop, wasn't that me who told about it to Vaclav? ;^)))
>
> I also like pkill, it accepts names instead of PID.
>
>