unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#4280: 23.1.50; vc-update fails under conflicts
@ 2009-08-28  5:45 Dieter Wilhelm
  2010-01-27  2:48 ` bug#4280: " Glenn Morris
  0 siblings, 1 reply; 5+ messages in thread
From: Dieter Wilhelm @ 2009-08-28  5:45 UTC (permalink / raw)
  To: emacs-pretest-bug; +Cc: rfrancoise

Hi

When using vc-update I'm receiving the following error message in *vc*:

  Conflict discovered in 'ansys-mode.el'.
  Select: (p) postpone, (df) diff-full, (e) edit,
          (h) help for more options: svn: Can't read stdin: End of file found

In GNU Emacs 23.1.50.1 (i486-pc-linux-gnu, GTK+ Version 2.12.12)
 of 2009-07-30 on elegiac, modified by Debian
 (emacs-snapshot package, version 1:20090730-1~lenny1)
Windowing system distributor `The X.Org Foundation', version 11.0.10402000
configured using `configure  '--build' 'i486-linux-gnu' '--host' 'i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs-snapshot:/etc/emacs:/usr/local/share/emacs/23.1.50/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.1.50/site-lisp:/usr/share/emacs/site-lisp' '--with-x=yes' '--with-x-toolkit=gtk' 'build_alias=i486-linux-gnu' 'host_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -DSITELOAD_PURESIZE_EXTRA=5000 -g -O2' 'LDFLAGS=-g -Wl,--as-needed' 'CPPFLAGS=''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_US.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default-enable-multibyte-characters: t

Major mode: Fundamental

Minor modes in effect:
  shell-dirtrack-mode: t
  global-hl-line-mode: t
  display-time-mode: t
  show-paren-mode: t
  tooltip-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  global-auto-composition-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t
  abbrev-mode: t

Recent input:
<switch-frame> <switch-frame> <switch-frame> <switch-frame> 
<switch-frame> <switch-frame> <switch-frame> <f2> <f3> 
<f2> <f3> C-x C-f C-g C-x o C-s a n s <return> <return> 
C-n C-n C-n C-n <return> y C-x v m <return> C-SPC C-n 
C-n C-n M-w M-x M-p M-n C-a C-k r e p o r t <tab> 
<return>

Recent messages:
Marking diary entries...done
For information about GNU Emacs and the GNU system, type C-h C-a.
Loading tramp...done
Quit
Mark saved where search started
Please type y, n, or !: 
Merging changes into /home/dieter/ansys-mode_11.0.2/ansys-mode.el...
vc-do-command: Running svn update ansys-mode.el...FAILED (status 1)
Mark set
goto-history-element: Beginning of history; no preceding item

Load-path shadows:
/usr/share/emacs/site-lisp/maxima/emaxima hides /usr/share/emacs-snapshot/site-lisp/maxima/emaxima
/usr/share/emacs/site-lisp/maxima/smart-complete hides /usr/share/emacs-snapshot/site-lisp/maxima/smart-complete
/usr/share/emacs/site-lisp/maxima/maxima hides /usr/share/emacs-snapshot/site-lisp/maxima/maxima
/usr/share/emacs/site-lisp/maxima/bookmode hides /usr/share/emacs-snapshot/site-lisp/maxima/bookmode
/usr/share/emacs/site-lisp/maxima/maxima-font-lock hides /usr/share/emacs-snapshot/site-lisp/maxima/maxima-font-lock
/usr/share/emacs/site-lisp/maxima/sshell hides /usr/share/emacs-snapshot/site-lisp/maxima/sshell
/usr/share/emacs/23.1.50/site-lisp/debian-startup hides /usr/share/emacs/site-lisp/debian-startup





^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#4280: 23.1.50; vc-update fails under conflicts
@ 2009-08-31 22:22 Dieter Wilhelm
  0 siblings, 0 replies; 5+ messages in thread
From: Dieter Wilhelm @ 2009-08-31 22:22 UTC (permalink / raw)
  To: 4280

Hi,

strange, at work I built an Emacs 23.1.1 from source and with it
vc-update/vc-merge for svn worked also under conflicts (vc evoked
smerge)!  Maybe this is an debian snapshot problem, I'm wondering how
to check this?

But then, there is also no mechanism in vc for svn (or emacs)
resolving the "conflicts" or removing the "conflict files".  I think
it would be the most convenient and logical when vc-next-action could
check whether there are "conflict files" and would do something in the
line of "svn resolve FILE" before trying to check in.

Best wishes

     Dieter





^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#4280: vc-update fails under conflicts
  2009-08-28  5:45 bug#4280: 23.1.50; vc-update fails under conflicts Dieter Wilhelm
@ 2010-01-27  2:48 ` Glenn Morris
  2010-01-27  4:13   ` Chong Yidong
  0 siblings, 1 reply; 5+ messages in thread
From: Glenn Morris @ 2010-01-27  2:48 UTC (permalink / raw)
  To: 4280

Dieter Wilhelm wrote:

> When using vc-update I'm receiving the following error message in *vc*:
>
>   Conflict discovered in 'ansys-mode.el'.
>   Select: (p) postpone, (df) diff-full, (e) edit,
>           (h) help for more options: svn: Can't read stdin: End of file found

It seems that in recent versions of svn, `svn update' defaults to
offering this "interactive conflict resolution". It can be disabled by
passing the --non-interactive option to svn. This option seems to have
been first added to svn in 2002, so it's probably fine to use this
unconditionally in vc-svn.el.






^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#4280: vc-update fails under conflicts
  2010-01-27  2:48 ` bug#4280: " Glenn Morris
@ 2010-01-27  4:13   ` Chong Yidong
  2010-01-28  5:55     ` Glenn Morris
  0 siblings, 1 reply; 5+ messages in thread
From: Chong Yidong @ 2010-01-27  4:13 UTC (permalink / raw)
  To: Glenn Morris; +Cc: 4280

Glenn Morris <rgm@gnu.org> writes:

> It seems that in recent versions of svn, `svn update' defaults to
> offering this "interactive conflict resolution". It can be disabled by
> passing the --non-interactive option to svn. This option seems to have
> been first added to svn in 2002, so it's probably fine to use this
> unconditionally in vc-svn.el.

OK, could you please do that?  (Thanks in advance.)






^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#4280: vc-update fails under conflicts
  2010-01-27  4:13   ` Chong Yidong
@ 2010-01-28  5:55     ` Glenn Morris
  0 siblings, 0 replies; 5+ messages in thread
From: Glenn Morris @ 2010-01-28  5:55 UTC (permalink / raw)
  To: 4280-done


  * vc-svn.el (vc-svn-update): Use "svn --non-interactive".






^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2010-01-28  5:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-08-28  5:45 bug#4280: 23.1.50; vc-update fails under conflicts Dieter Wilhelm
2010-01-27  2:48 ` bug#4280: " Glenn Morris
2010-01-27  4:13   ` Chong Yidong
2010-01-28  5:55     ` Glenn Morris
  -- strict thread matches above, loose matches on Subject: below --
2009-08-31 22:22 bug#4280: 23.1.50; " Dieter Wilhelm

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).