On Fri, Apr 15, 2011 at 09:40, Dan S <danstowell+de...@gmail.com> wrote:

>>> 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
> http://pastie.org/1797302
> Please let me know if it looks like the right things have happened -
> then I'll push.

Looks good to  me.


Felipe Sateler

pkg-multimedia-maintainers mailing list

Reply via email to