[darcs-users] post-hoc move
zooko at zooko.com
Thu Jul 30 19:08:56 UTC 2009
Hi Hamish Allan.
I'm not sure about your idea of "darcs mv" figuring out that the file
had already been mv'ed. That sounds like the kind of thing that
sometimes leads me to further confusion because it is "too clever"
and it becomes hard for me to figure out what the tool may or may not
have done. But anyway, about how to recover from your situation:
On Thursday,2009-07-30, at 9:15 , Hamish Allan wrote:
> On Thu, Jul 30, 2009 at 3:34 PM, Zooko Wilcox-
> O'Hearn<zooko at zooko.com> wrote:
> I did try reverting the changes but I still ended up with
> files in a state of both "R" and "a",
What? I'm still not understand what's going on there. If you do
'darcs revert' and tell it to revert all of the relevant changes
(i.e. any rm's, add's, hunks, or mv's for those two filenames), then
it should be right back where you started. Why doesn't that work for
> and even so, making a user step
> through potentially hundreds of changes to pick out those reverts is
> not a great user experience.
You can give filenames like "darcs revert $FILE1 $FILE2" and then it
will prompt you only for changes which affect the files in question
(which means there should only be four changes -- an rm, a hunk for
the first file and an add and a hunk for the second filename.
More information about the darcs-users