Hi folks,
I ran into a problem today with version 1.03 on my Windows 2000 box.
I'll get to that in a moment. First, when I couldn't fix my problem with
1.03, I thought I'd try building unstable and see if that worked any
better. However, I couldn't even download the repo:
C:\Documents and Settings\xoltar\My Documents\src\haskell>darcs get
http://abrid
gegame.org/repos/darcs-unstable
Copying patch 3518 of 3518... done!
Applying patches to the "working" directory...
................................................................................
................................................................................
................................................................................
................................................................................
................................................................................
................................................................................
................................................................................
................................................................................
................................................darcs: hscurl.c-0:
renameFile: p
ermission denied (Permission denied)
C:\Documents and Settings\xoltar\My Documents\src\haskell>darcs --version
1.0.3 (release)
Oh well. The original problem I had was that I accidentally included a
binary file in a repo, call it repo A, that I didn't really want in
there. Before realizing this, I pulled a copy, call it repo B, and did a
bunch of work in there. Changes to the binary file were made, and
inadvertently included in the patch I then recorded. When I tried to
push B's patch back to A, it failed because of a conflict in this binary
file. As it happens, I don't even care about this binary file, I'd be
happy to overwrite it, but there's no option for that. Also, the error
message suggests a --mark-conflicts option:
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.
However, the option isn't recognized:
C:\A\B\src>darcs push --mark-conflicts
darcs failed: unrecognized option `--mark-conflicts'
C:\A\B\src>darcs --mark-conflicts push
darcs failed: Invalid command '--mark-conflicts'!
Finally, when I try to unrecord the patch so that I can first make a
patch consisting of "darcs remove"ing the binary file, it asks me which
patches to unrecord, and then hangs. No CPU activity, no disk activity.
I'm stuck!
Thanks,
Bryn
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
