2011/4/15 Felipe Sateler <fsate...@debian.org>:
> On Wed, Apr 13, 2011 at 14:58, Dan S <danstowell+de...@gmail.com> wrote:
>> 2011/4/10 Dan S <danstowell+de...@gmail.com>:
>>> 2011/4/10 Felipe Sateler <fsate...@debian.org>:
>>>> On Sun, Apr 10, 2011 at 04:34, Dan S <danstowell+de...@gmail.com> wrote:
>>>>>>>>> ...and now SC 3.4.2 has been released on the same day. So I've
>>>>>>>>> imported it into the git (3 patches no longer needed, hooray) - all
>>>>>>>>> testing and feedback welcome.
>>>>>>>> Looks like you didn't actually merge the upstream branch into master
>>>>>>>> but instead imported the new tarball as a new commit.
>>>>>>> I used git-import-orig, surely that's the right thing to do?
>>>>>>> <http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.NEW.UPSTREAM>
>>>>>> Hmm, it seems to have done a broken import. Did it actually succeed in
>>>>>> the merge?
>>>>> Yes it did. If there's anything I should do that can fix this, please
>>>>> let me know.
>>>>> There will be a version 3.4.3 out fairly soon (3.4.2 has a
>>>>> regression!) so I'll need to know how to import it right.
>>>> Hmm, I usually just call git-import-orig on the tarball and all the
>>>> magic is done. I'm not sure what could have gone wrong.
>>>> If 3.4.3 will be out soon, then maybe we can let this one go and do
>>>> the 3.4.3 on right instead.
>>> OK, well I'll do it the same way when 3.4.3 is out, but I'll do a test
>>> run and try to make sure the commits are as expected before pushing!
>> I've tried to import 3.4.3 onto a clean repository (using
>> git-import-orig) and it hit a merge conflict.
>> A log of my session is at <http://pastie.org/1792082> - I'd be
>> grateful for any advice on whatever might have gone wrong. Am I using
>> git-import-orig as intended?
> Yes. But the borked import of 3.4.2  breaks it. Try first merging from
> the upstream branch and then using git-import-orig.

Ah, now I see. OK it works now, and all is looking good. My local git
history (on master) now looks like

Please let me know if it looks like the right things have happened -
then I'll push.


pkg-multimedia-maintainers mailing list

Reply via email to