darcs

Issue 2190 darcs: bug at src/Darcs/Patch/V1/Commute.hs:318 compiled Apr 24 2012 13:34:40 in function reconcileUnwindings

Title darcs: bug at src/Darcs/Patch/V1/Commute.hs:318 compiled Apr 24 2012 13:34:40 in function reconcileUnwindings
Priority bug Status given-up
Milestone 2.8.1 Resolved in
Superseder Nosy List markstos
Assigned To
Topics Conflicts

Created on 2012-04-30.16:58:11 by markstos, last changed 2017-07-31.00:41:39 by gh.

Messages
msg15637 (view) Author: markstos Date: 2012-04-30.16:58:09
1. Summarise the issue (what were doing, what went wrong?)

I was pulling a patch from beta back to alpha. I believe the patch 
involved was an "alternate reality" patch... an intentional conflict. We 
done some development work, and then had to have it undone in production, 
but still exist in development so we could publish it later. 

The repo is unfortunately not one I can share. I can see from output that 
a nested merger was involved. 

3. What darcs version are you using? (Try: darcs --exact-version)

The released version of darcs 2.8. (Darcs 2.5.2 also failed with a 
similar error when attempting this pull). 

4. What operating system are you running?
 
Ubuntu 10.04.
History
Date User Action Args
2012-04-30 16:58:11markstoscreate
2017-07-31 00:41:39ghsetstatus: unknown -> given-up