Bug#778594: git-import-orig fails to merge into packaging branch

2015-03-04 Thread Guido Günther
Hi, On Wed, Mar 04, 2015 at 12:30:43PM +0200, Markus Lehtonen wrote: > Hi, > > On Fri, 2015-02-20 at 11:25 +0100, Guido Günther wrote: > > On Fri, Feb 20, 2015 at 09:36:52AM +0200, Markus Lehtonen wrote: > > > >There were two things I didn't like about the svn workflow for Debian > > > >packages.

Bug#778594: git-import-orig fails to merge into packaging branch

2015-03-04 Thread Markus Lehtonen
Hi, On Fri, 2015-02-20 at 11:25 +0100, Guido Günther wrote: > On Fri, Feb 20, 2015 at 09:36:52AM +0200, Markus Lehtonen wrote: > > >There were two things I didn't like about the svn workflow for Debian > > >packages. debian/ and upstream source not in one tree (so I can not > > >build with a patch

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-20 Thread Guido Günther
On Fri, Feb 20, 2015 at 09:36:52AM +0200, Markus Lehtonen wrote: > >There were two things I didn't like about the svn workflow for Debian > >packages. debian/ and upstream source not in one tree (so I can not > >build with a patched package easily to try fixes) and having to use an > >export dir (s

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-19 Thread Markus Lehtonen
Hi, On 18/02/15 09:43, "Guido Günther" wrote: >On Tue, Feb 17, 2015 at 10:09:16PM +0200, Markus Lehtonen wrote: >> Hi, >> >> On 17/02/15 20:05, "Guido Günther" wrote: >>>On Tue, Feb 17, 2015 at 11:39:34AM +0100, Martin Pitt wrote: >> >> Hello again, >> >> >> >> Martin Pitt [2015-02-17 9:55 +0

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-17 Thread Guido Günther
On Tue, Feb 17, 2015 at 10:09:16PM +0200, Markus Lehtonen wrote: > Hi, > > On 17/02/15 20:05, "Guido Günther" wrote: > >retitle 778594 gbp import-orig: allow to ignore changes outside of debian/ > >severity 778594 wishlist > >thanks > > > >On Tue, Feb 17, 2015 at 11:39:34AM +0100, Martin Pitt wro

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-17 Thread Markus Lehtonen
Hi, On 17/02/15 20:05, "Guido Günther" wrote: >retitle 778594 gbp import-orig: allow to ignore changes outside of debian/ >severity 778594 wishlist >thanks > >On Tue, Feb 17, 2015 at 11:39:34AM +0100, Martin Pitt wrote: >> Hello again, >> >> Martin Pitt [2015-02-17 9:55 +0100]: >> > Ah indeed,

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-17 Thread Guido Günther
retitle 778594 gbp import-orig: allow to ignore changes outside of debian/ severity 778594 wishlist thanks On Tue, Feb 17, 2015 at 11:39:34AM +0100, Martin Pitt wrote: > Hello again, > > Martin Pitt [2015-02-17 9:55 +0100]: > > Ah indeed, most upstream updates have a "Merge tag 'upstream/XXX' in

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-17 Thread Martin Pitt
Hello again, Martin Pitt [2015-02-17 9:55 +0100]: > Ah indeed, most upstream updates have a "Merge tag 'upstream/XXX' into > experimental" after "Imported Upstream version XXX", but 217 doesn't. > Probably I already had some trouble with this in 218, as curiously the > 218 update has two identica

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-17 Thread Martin Pitt
Hello Guido, Guido Günther [2015-02-17 9:17 +0100]: > This is to be expected since version 217 was imported to > 'experimental' without merging from branch 'upstream'. > > Commit > > a05fbd0f2be05e61037dc57d239a436f651519fe Ah indeed, most upstream updates have a "Merge tag 'upstream/XXX'

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-17 Thread Guido Günther
Hi Martin, On Tue, Feb 17, 2015 at 07:33:20AM +0100, Martin Pitt wrote: > Package: git-buildpackage > Version: 0.6.22 > > Hello, > > We use git-buildpackage to maintain the systemd Debian package. I was > just trying to import a new upstream version into the experimental > branch, which fails: >

Bug#778594: git-import-orig fails to merge into packaging branch

2015-02-16 Thread Martin Pitt
Package: git-buildpackage Version: 0.6.22 Hello, We use git-buildpackage to maintain the systemd Debian package. I was just trying to import a new upstream version into the experimental branch, which fails: $ git-import-orig --uscan gbp:info: Launching uscan... gbp:info: using ../systemd_219.or