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'...Processing '/etc/joe/ftyperc'...done
done
cm=(nil) ch=(nil) cv=(nil) ho=(nil) lf=0x909aafc DO=(nil) ll=(nil) up=(nil)
UP=(nil) cr=0x909ab00
Sorry, your terminal can't do absolute cursor positioning.
It's broken
error: There was a problem with the editor '/usr/bin/jmacs -nonotice
-nobackups -noxon -asis'.
Not committing merge; use 'git commit' to complete the merge.
gbp:error: git returned 1
gbp:error: Couldn't merge from "upstream/0.1.14"
gbp:error: Merge failed, please resolve.
gbp:debug: rm ['-rf', '../tmpyS9Gn8'] []
Please return to the old behavior, where the conflicts are simply
reported.
In this case the upgrade was run inside Emacs shell (M-x shell), so
obviously git-buildpackage cannot open another program inside it.
Besides, there may be numerous conflicts.
It is better to get list of problems first and not to be forced to
work immediately one-by-one.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.11.3
ii git [git-core] 1:1.7.9-1
ii python 2.7.2-10
ii python-dateutil 1.5-1
ii python2.6 2.6.7-4
ii python2.7 2.7.2-13
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.67
ii pristine-tar 1.19
Versions of packages git-buildpackage suggests:
ii python-notify <none>
ii unzip 6.0-5
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
