2010/9/1 <J.B.C.Engelen@...1578...>:
I was hoping the 'all-awesome' bzr would make life easier.
Ciao,
Johan
To merge revision 1234 from trunk into 0.48 branch, say this in 0.48.x
branch's directory:
bzr merge -r 1233..1234 ../trunk
Regards, Krzysztof