Working with Subversion
Patrick Mézard
pmezard at gmail.com
Sat Feb 23 10:25:53 CST 2008
Antoine Pitrou a écrit :
> Le mercredi 20 février 2008 à 22:30 +0100, Patrick Mézard a écrit :
>>> IMO, using both named branches and clones is much more practical
>> than using mq.
>>
>> I don't really see how the merge trick can be applied to more than one
>> revision.
>
> I'm not sure what "merge trick" you are talking about. I don't push to
> SVN, perhaps that's the reason :)
Say you have (U for upstream, P for patches)
U1--U2--U3--U4
\
\--P1--P2
How do you rebase P1 and P2 on top of U4 ?
The merge trick would be to end with:
U1--U2--U3--U4--P1*--P2*
\ / /
\------P1----P2
MQ does that better. But I may be missing something here.
--
Patrick Mézard
More information about the Mercurial
mailing list