[Pkg-puppet-devel] Tags and upstream

[Stig Sandbeck Mathisen]

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.

-- 
Stig Sandbeck Mathisen <ssm at debian.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-puppet-devel/attachments/20120302/9fbe99f2/attachment.pgp>