[darcs-users] darcs repair won't repair
Juliusz Chroboczek
Juliusz.Chroboczek at pps.jussieu.fr
Tue Feb 6 20:59:28 UTC 2007
> But when I run darcs repair, it fails with a message saying that
> I have duplicate patch names. Which is true, those were recorded one
> month ago.
I think there's a confusion id.
Darcs identifies patches with their PatchInfo (pi), which is
a quadruple of (date, name, author, log). Two patches in a Darcs repo
must never have the same pi.
So two patches can have the same name as long as they have a different
date. Two patches can have the same date and the same name as long as
they have a different author.
Two distinct patches must never have identical date, name, author and
log message.
> - How can I get out of this situation ?
I think the simplest solution is to unpull all patches until one of
the two that conflict, then record again by hand. If that is not
acceptable to you, we'll need to perform some surgery on the
repository by hand.
Juliusz
More information about the darcs-users
mailing list