Tommy Pettersson wrote:
If darcs actually succeeds repairing the repo and the patch
still fails the same way each time, it sounds very much like a
bug in darcs.
(Just before sending this I saw Zooko has filed bug report #525,
which seems to be the same error.)
darcs choking and leaving the repo in a state that you must use darcs
repair on because it can find the file may indeed be a bug. I'll be
happy to zip up copies of the offending repo for test. It's 100%
repeatable. Or at lease it has been so far.
But the source of problem is certainly not darcs. One of my co-workers
pushed a patch that nuked all the files. But they still exist in my
tree so my patches try to modify those files that now don't exist.
Well, (pretending there was no failure on darcs' part) I wonder,
perhaps this situation is a job for the rollback command? If
lucky, just issue 'darcs rollback' and select the offending
patch.
Kind of. I unpulled things prior to DirRestructure then applied
DirRestructure then rolled it it back. The issue now is that rollback
dosen't affect the working directory. So one of the following patches
has a conflict with a file in the ./src/ dirctory but when I go to the
working dir to edit the file and fix the conflict the file dosen't exist
anymore.
I need what ammounts to the union of unpull and rollback. Or some
method of generating and applying a reverse of a patch.
Of course I still don't really grok what I'm doing. Which is why I'm
doing it. *grin*
option. Then it might be better to just restore what's missing
in the current version and record an "ooops, put this back"
patch.
Yeah this what I did to establish a new master.
If there are many patches depending on the offending patch it is
most likely not an option to remove it, since you'd also have to
remove and manually (e.g., with diff'n'patch) reconstruct and
record anew all its depending patches.
Yeah thats the case.
How would I go about accomplishing whats effectively a rollback but that
changes the working dir.
So again I _think_ that basically I need to apply a patch and right
after apply the inverse of that patch so that it neutralizes the changes.
Then I think the patches after that will all apply.
What's a mystery is how did darcs allow a user to remove a file from the
repo and then later on record a patch against that file without an add
in between? Thats the only way I can see how this could happen.
--
Richard A. Smith
Bitworks, Inc
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
