On Mon, Feb 18, 2013 at 12:44 PM, Stefan Sperling <s...@elego.de> wrote:
> Typing 'enter' also postpones here. > But answering 'q' works for me before and after r1447398, on OpenBSD. > (Except that typing backspace doesn't erase characters at the prompt :-( ) > > Which platform are you on? Windows? > Is it possible that the new code added for prompting on the terminal > is responsible for this? Still not working for me. This is the sequence I am doing: $ svn info Path: . Working Copy Root Path: /Users/markphip/work/src-trunk URL: https://svn.apache.org/repos/asf/subversion/trunk Relative URL: ^/subversion/trunk Repository Root: https://svn.apache.org/repos/asf Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68 Revision: 1447423 Node Kind: directory Schedule: normal Last Changed Author: stsp Last Changed Rev: 1447398 Last Changed Date: 2013-02-18 12:17:53 -0500 (Mon, 18 Feb 2013) $ svn merge ^/subversion/branches/fsfs-format7 . .. snipped ... Summary of conflicts: Text conflicts: 40 Tree conflicts: 70 Conflict discovered in file 'Makefile.in'. Select: (p) postpone, (df) diff-full, (e) edit, (m) merge, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: q Conflict discovered in file 'build.conf'. Select: (p) postpone, (df) diff-full, (e) edit, (m) merge, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: q Conflict discovered in file 'subversion/bindings/swig/include/svn_types.swg'. Select: (p) postpone, (df) diff-full, (e) edit, (m) merge, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: ..etc ... -- Thanks Mark Phippard http://markphip.blogspot.com/
