[darcs-users] rmfile and addfile in same patch

[Nimrod A. Abing]

On 10/19/05, David Roundy <droundy at darcs.net> wrote:
> I'd be curious if you could check out the original windows repo and
> tarball, if they're still around, just to know how this happened.  But the
> solution is to unrecord the rename patch and repair the repository.

Ok, I just did the following in the corrupted repo:

darcs unrec --patch="Rename acl.php to ACL.php."

Wed Oct 12 00:50:50 PHT 2005  Nimrod A. Abing <nimrod.abing at gmail.com>
  * [2.1] Rename acl.php to ACL.php.
Shall I unrecord this patch? (1/1) [ynWvpxqadjk], or ? for help: y
Finished unrecording.

darcs check
Looks like we have a difference...
Just {
hunk ./modules/ACL.php 1
[ removed very long output ]
rmfile ./modules/ACL.php
}

Inconsistent repo!

darcs repair
Fixing pristine tree...

darcs check
The repo is consistent!

darcs what -s
Yikes, pending has conflicts!
A ./modules/ACL.php
R ./modules/acl.php

I do not know what to do at this point.
--
_nimrod_a_abing_

v1sw5CPJYUhw5ln3pr8OUSck6ma8u7LBw3DWNTm5g/l7DaIs7Rr4e6t5Xb4Op1en3g5RZAHC