[darcs-devel] [issue1419] darcs unrevert => conflicts

[Zooko]

New submission from Zooko <zooko at zooko.com>:

I just ran darcs unrevert and it said "We have conflicts".  Is that  
supposed to happen?  I would have assumed that you just lose the  
option of unreverting if you've made a conflicting change.  Also, I  
then said not to do any unreverts but it appears to have still  
changed my working directory.  :-(

HACK bryces-powerbook-g4-12:~/playground/allmydata/tahoe/trunk$ darcs  
unrevert
Backing up ./src/allmydata/web/check_results.py(-darcs-backup0)
We have conflicts in the following files:
./src/allmydata/web/check_results.py
hunk ./src/allmydata/web/check_results.py 618
-            return T.div[T.a(href=return_to)["Return to file/ 
directory."]]
+            return T.div[T.a(href=return_to)["Return to parent  
directory"]]
Shall I unrevert this change? (1/2)  [ynWsfvplxdaqjk], or ? for help: n
Skipped unrevert of 1 patch.
You will not be able to unrevert this operation! Proceed? yes

----------
messages: 7594
nosy: dmitry.kurochkin, kowey, simon, thorkilnaur, zooko
status: unread
title: darcs unrevert => conflicts

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