Russ Allbery <[EMAIL PROTECTED]> writes:
> After every upstream merger, I have to review every patch applied to the
> package *anyway* to make sure that it's still sane, and I find that easier
> to do by reading through the contents of debian/patches than by running
> filterdiff on diff.gz and then trying to work through the intermingled
> results of multiple changes.
If you were using one branch to each "logical unit patch" you might
merge the new upstream against it and then merge all together again in
a new release branch that you upload.
That might looks like:
branches
upstream
fix-bug-N
fix-bug-M
add-feature-X
debian
So every new upstream release you merge it against each fix and add
branch. Then those against debian/. Should work well.
--
O T A V I O S A L V A D O R
---------------------------------------------
E-mail: [EMAIL PROTECTED] UIN: 5906116
GNU/Linux User: 239058 GPG ID: 49A5F855
Home Page: http://www.freedom.ind.br/otavio
---------------------------------------------
"Microsoft gives you Windows ... Linux gives
you the whole house."
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
