[Pkg-puppet-devel] Tags and upstream

[micah anderson]

On Fri, 02 Mar 2012 17:19:32 +0100, Stig Sandbeck Mathisen <ssm at debian.org> wrote:
> micah anderson <micah at riseup.net> writes:
> 
> > On Fri, 24 Feb 2012 18:16:36 +0100, Stig Sandbeck Mathisen <ssm at debian.org> wrote:
> 
> >> If you like, I could try doing a local "git import-orig" on top of
> >> that, and see if a merge will create a direct "upstream" history line
> >> which can be merged into our "master".
> >
> > If you would like to try it, please feel free.
> 
> After a few tries, I got it to work nicely. :)
> 
> "git diff" is happy, and "debdiff" shows no differences in the source
> packages created from the different 2.7.11 upstream commits (and none in
> the binary packages created from them, which would have been surprising)
> 
> I've pushed the result to git.debian.org.

Nice! Thanks for getting that to work (and for sending along the steps
you are using). I think that will help keep things more sane from here
on out!

micah