[darcs-devel] [issue551] Improve error message when darcs push encounters conflicts

[Eric Kow]

New submission from Eric Kow <eric.kow at gmail.com>:

Right now, we get:
  darcs failed:  Refusing to apply patches leading to conflicts.
  If you would rather apply the patch and mark the conflicts,
  use the --mark-conflicts option There are conflicts in the following files:

The basic problem is that darcs push executes darcs apply (i.e. as if on the
command line).  A simple solution might be to capture the output and search for
the text 'If you would rather apply'...

----------
messages: 2175
nosy: beschmi, droundy, kowey, tommy
priority: feature
status: unread
title: Improve error message when darcs push encounters conflicts
topic: ProbablyEasy

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue551>
__________________________________