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 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'] [] | > | | The problem doesn't seem to be the merge conflict but rather that we're | merging an annotated tag. Do you agree?
Can't really tell, but I take your word for it. Jari -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
