darcs

Message5498

Author kowey
Recipients andreas.abel, beschmi, claus.reinke, dagit, darcs-devel, kowey, simon, tommy
Date 2008-08-14.05:50:39
Issue Issue911 whatsnew shows: mv A -> B; rm A; add B
Content
Sorry for the late reply.

To work around this situation, you can remove the pending patch
(_darcs/patches/pending).

The hanging is because the repository is still using the old darcs 1 format (you
would need to convert to the darcs 2 format to avoid the exponential merge problem).

The reason there was an exponential merge was because of the mv A -> B; rm A;
add B local changes.  I believe these were caused by a bug in handling the
pending patch -- one that has been fixed.

I'm marking this as resolved.  If anybody can show me an instance of this bug
being creating in darcs 2, please open a new issue.
History
Date User Action Args
2008-08-14 05:50:39koweycreate
2008-08-14 05:50:42koweylinkissue911 messages
2008-08-14 05:50:42koweysetrecipients: + kowey, tommy, beschmi, darcs-devel, dagit, simon, claus.reinke, andreas.abel
2008-08-14 05:50:42koweysetmessageid: <1218693042.85.0.0730669076777.issue911@darcs.net>
2008-09-20 14:42:28adminsetrecipients: + andreas.abel, - andreas.abel