Your message dated Thu, 9 Feb 2012 20:08:20 +0200
with message-id <[email protected]>
and subject line Re: Bug#659239: git-buildpackage: do not try to start EDITOR
on conflict
has caused the Debian Bug report #659239,
regarding git-buildpackage: do not try to start EDITOR on conflict
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
659239: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=659239
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
On 2012-02-09 15:29, Guido Günther wrote:
> ...
| > 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'] []
| >
| > In this case the upgrade was run inside Emacs shell (M-x shell), so
| > obviously git-buildpackage cannot open another program inside it.
|
| Gbp hasn't changed in this regard. I wonder if git has? I havn't seen
| this so far.
Oh, in that case, I'll check what's new with git.
Closing,
Jari
--- End Message ---
