Bug#659239: git-buildpackage: do not try to start EDITOR on conflict

2012-02-09 Thread jaalto
On 2012-02-09 19:10, Guido Günther wrote: | retitle 659239 Disable interactive merge edits | affects 659255 git-buildpackage | thanks | | On Thu, Feb 09, 2012 at 07:59:33AM -0500, Jari Aalto wrote: | > Package: git-buildpackage | > Version: 0.5.32 | > Severity: normal | > | > On conflict situatio

Bug#659239: git-buildpackage: do not try to start EDITOR on conflict

2012-02-09 Thread Guido Günther
retitle 659239 Disable interactive merge edits affects 659255 git-buildpackage thanks On Thu, Feb 09, 2012 at 07:59:33AM -0500, Jari Aalto wrote: > Package: git-buildpackage > Version: 0.5.32 > Severity: normal > > On conflict situation the latest git-buildpackage tries to start > EDITOR: > >

Bug#659239: git-buildpackage: do not try to start EDITOR on conflict

2012-02-09 Thread Guido Günther
On Thu, Feb 09, 2012 at 07:59:33AM -0500, Jari Aalto wrote: > Package: git-buildpackage > Version: 0.5.32 > Severity: normal > > On conflict situation the latest git-buildpackage tries to start > EDITOR: > > ... > gbp:debug: git ['merge', 'upstream/0.1.14', '--no-summary'] [] > Auto-m

Bug#659239: git-buildpackage: do not try to start EDITOR on conflict

2012-02-09 Thread Jari Aalto
Package: git-buildpackage Version: 0.5.32 Severity: normal On conflict situation the latest git-buildpackage tries to start EDITOR: ... gbp:debug: git ['merge', 'upstream/0.1.14', '--no-summary'] [] Auto-merging src/x11.cc Removing src/PScreen.hh Processing '/etc/joe/jmacsrc'.