Joey Hess wrote: > Damyan Ivanov wrote: > > -=| Russ Allbery, Thu, Jan 24, 2008 at 03:14:43PM -0800 |=- > > > > > I still find it really important to be able to separate out > > > individual changes to feed upstream when working with a CPAN > > > package. With quilt, I can do that. With git, I can do that, > > > > How? > > (I am not saying it is impossible, but every time I try to imagine > > how to do it, I reach a point where quilt seems far more convenient > > :) > > * Create a branch for the change. > * Make the change there. > * Merge the change back to master. > > * When there's a new upstream release, handle it as usual (ie, use > git-import-orig to update the upstream branch, and merge it into > master). > * Then merge the upstream branch into the change's branch too. > (Or, skip doing this if you're lazy.) > > * When you want to send the change upsteam, git diff between the > upstream branch and the change's branch. > * (If you decided to be lazy before, merge the latest upstream release > into the branch first.) As far as I can see, all of that can be done with Subversion.
Description: This is a digitally signed message part.