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.
Ok, but this is only for the parent branch if I understand ? I may want to to this against partner branch. > > 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>. The idea here is to use the "revision at point" if not mark are set in the missing buffer: - if no mark or only one is set: use -r<revision at point or marked> - if 2 marks are set: use -r<mark1>..<mark2> I think this could be used for diff and merge --preview, isn't it ? > <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 Right, I like the http://www.venge.net/mtn-wiki/DaggyFixes method. I need to think about all this on real work to figure out the pro and cons of all thoses stuffs. For now my use is quite simple :-) Regards. -- Daniel Dehennin Récupérer ma clef GPG: gpg --keyserver pgp.mit.edu --recv-keys 0x6A2540D1 _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
