[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    [darcs-devel] [darcs #564] push doesn't take --mark-conflicts
From:       "Vagn Johansen via RT" <bugs () darcs ! net>
Date:       2005-10-21 8:13:12
Message-ID: rt-3.0.12-564-2883.7.03585471098727 () darcs ! net
[Download RAW message or body]


Fri Oct 21 04:12:58 2005: New ticket: 564.
Transaction: Ticket created by vagn.johansen@gmail.com
       Queue: Darcs
     Subject: push doesn't take --mark-conflicts (which it should just pass to apply)
       Owner: Nobody
  Requestors: vagn.johansen@gmail.com
      Status: new
 Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=564 >

Juliusz Chroboczek requested this ticket in #561

I had a single-user scenario were I wanted to push to a repository
with local changes.

I got a message from push saying that there was a conflict. Since
there was no way to discover what they were I was stuck.

darcs push output:
"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 to apply.
There are conflicts in the following files:
./vlib.pm"

whatsnew ->   No changes!
resolve  ->   No conflicts to resolve.
pull -a   >   No remote changes to pull in!




_______________________________________________
darcs-devel mailing list
darcs-devel@darcs.net
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[prev in list] [next in list] [prev in thread] [next in thread]