>>>>> "Daniel" == Daniel Dehennin <[EMAIL PROTECTED]> writes:
Daniel> Le 5495 Septembre 1993, Vincent Ladeuil a envoyé:
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> Ok, but this is only for the parent branch if I understand ?
Daniel> I may want to to this against partner branch.
Sure, I was pointing out simpler methods for the usual case
(simpler being relative, I don't find the syntax obvious :-/).
>>
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>.
Daniel> The idea here is to use the "revision at point" if not mark are set
in
Daniel> the missing buffer:
Daniel> - if no mark or only one is set: use -r<revision at point or marked>
Daniel> - if 2 marks are set: use -r<mark1>..<mark2>
Daniel> I think this could be used for diff and merge --preview, isn't it ?
Well diff and merge may give slightly different results (for some
corner cases I don't remember, sorry), but in the common cases,
and as long as this provides a way to get a feeling of what is
coming in, the differences should not be relevant.
>> <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
Daniel> Right, I like the
Daniel> http://www.venge.net/mtn-wiki/DaggyFixes method. I
Daniel> need to think about all this on real work to figure
Daniel> out the pro and cons of all thoses stuffs. For now
Daniel> my use is quite simple :-)
Indeed, this often *avoids* the need for cherry-picks.
Vincent
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
