<!DOCTYPE html>
<html>
<head>
<title></title>
<style type="text/css">p.MsoNormal,p.MsoNoSpacing{margin:0}</style>
</head>
<body><div>Hi Matt,<br></div>
<div><br></div>
<div>Thank you for noticing and emailing me! Looks like I forgot to push the branches. Am away until the 4th of January without access to gpg keys but am happy to push the branches and update the package as soon as I get back. <br></div>
<div><br></div>
<div>Cheers,<br></div>
<div><br></div>
<div>Ana<br></div>
<div><br></div>
<div><br></div>
<div>On Tue, Jan 1, 2019, at 9:41 PM, Matt Brown wrote:<br></div>
<blockquote type="cite"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div>Hi Ana, <br></div>
<div><br></div>
<div>First, thanks for your help and work on keeping the scamper package updated recently. I'm finding myself having some more time for Debian work lately so I started to take a look at taking my turn to update the package for the latest release (20181219).<br></div>
<div><br></div>
<div>In trying to do that I'm a bit confused about the state of the repository as it doesn't seem to match the format I'd expect from git-buildpackage, specifically the last two revisions imported (20180309 and 20180504) don't seem to be present in the upstream and pristine-tar branches as I'd expect gbp import-orig to do - e.g. the last commit on both these branches is for 20171204.<br></div>
<div><br></div>
<div><a href="https://salsa.debian.org/ineteng-team/scamper/network/master">https://salsa.debian.org/ineteng-team/scamper/network/master</a>, <a href="https://salsa.debian.org/ineteng-team/scamper/commits/pristine-tar">https://salsa.debian.org/ineteng-team/scamper/commits/pristine-tar</a> and <a href="https://salsa.debian.org/ineteng-team/scamper/commits/upstream">https://salsa.debian.org/ineteng-team/scamper/commits/upstream</a> help to illustrate the problem. <br></div>
<div><br></div>
<div>Can you recall if this is/was intentional? or I'm wondering if this was a mistake (e.g. maybe a wrong parameter to gbp --upstream-branch and a missing --pristine-tar option)? <br></div>
<div><br></div>
<div>Assuming this isn't intentional, then I think just a couple of runs of the gbp pristine-tar command to update the patch files in the branch will be enough to get us back on track (we'll still be missing the upstream branch commits, but I don't think that's a blocking problem, mostly cosmetic).<br></div>
<div><br></div>
<div>Look forward to hearing from you.<br></div>
<div><br></div>
<div><div>Cheers<br></div>
<div><br></div>
<div>-- <br></div>
<div dir="ltr"><div dir="ltr"><div dir="ltr"><div>Matt Brown<br></div>
<div><a href="mailto:matt@mattb.net.nz">m</a><a href="mailto:attb@debian.org">attb@debian.org</a><br></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</blockquote><div><br></div>
</body>
</html>