On Sat, 2014-09-06 at 22:03 -0700, Manoj Srivastava wrote:
> On Sun, Sep 07 2014, Scott Kitterman wrote:
>
> > On September 6, 2014 11:30:11 PM EDT, Manoj Srivastava <srivasta@debian.org> wrote:
>
> > I'll confess up front that I'm a neophyte when it comes to git. From
> > what I can tell though we've been using git-dpm for feature branches
> > in pkg-clamav and it seems to me to work fine.
>
> Oh, it works mostly fine, with some finicky handling of the
> ephemeral patched branch. I must worry about checking out the patched
> branch, sherry picking commits to it, handling conflicts, rebasing,
> squashing, rearranging -- and I did all that for a while before I
> discovered git-debcherry, It got old fast. Perhaps it is my fault, my
> feature branches sometimes have slightly overlapping changes. I never
> ever want to muck with something merely to create serialized linear
> patches for packaging.
[...]
How does git-debcherry cope with the overlapping changes when generating
debian/patches? What can you do if it fails to linearise the changes
(as, apparently, it may sometimes do)?
Ben.
--
Ben Hutchings
Experience is directly proportional to the value of equipment destroyed.
- Carolyn Scheppner
Attachment:
signature.asc
Description: This is a digitally signed message part