Henrique de Moraes Holschuh <h...@debian.org> writes: > Downstream, you "fork" from upstream each release, either by merging > topic branches (_rebasing_ them if any sort of conflict happens, all > merge commits must be perfectly clean ones), or rebasing the debian > changes on top of the new upstream and calling that the new 'master' > branch.
With Bazaar, one doesn't need to rebase to achieve this. The ‘loom’ plugin allows for tracking changes against upstream revisions, while *preserving* the history of changes, and generating tidy change sets to feed back upstream (or, in our use case of interest, to use as Quilt patches). <URL:http://fourkitchens.com/blog/2009/04/20/alternatives-rebasing-bazaar> -- \ “The restriction of knowledge to an elite group destroys the | `\ spirit of society and leads to its intellectual | _o__) impoverishment.” —Albert Einstein | Ben Finney -- To UNSUBSCRIBE, email to debian-devel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
