>>>>> "Daniel" == Daniel Dehennin <[EMAIL PROTECTED]> writes:
Daniel> Le 5495 Septembre 1993, Stefan Reichör a envoyé:
>> That seems feasible.
>> But wait, I have another idea now:
>> What about bzr merge --preview url?
>>
>> Could you try this command on the commandline and report if this does
>> what you want.
Daniel> I think we have 2 different things here.
Daniel> Look the changes made by the "remote" developper on his branch:
Daniel> bzr diff -r<old>..<new> URL
'bzr diff -rancestor:..branch::parent' should do the trick.
Daniel> Look the patch that will be applied to my branch:
Daniel> bzr merge --preview -r<old>..<new> URL
'bzr merge --preview' should be enough.
So you don't have to extract <old> and <new>.
<snip/>
Daniel> NB: I made some test and see that it seems that bzr
Daniel> support cherry picking.
bzr support merging cherry-pick, but it doesn't record them (yet).
See: http://bazaar-vcs.org/MergeTracking
Vincent
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
