[darcs-devel] [issue494] Applying patches leaves changes in working copy

[Simon Marlow]

New submission from Simon Marlow <simonmar at microsoft.com>:

I have a combination of a GHC tree and a patch bundle that displays the
following behaviour:

~/darcs/ghc-bug > darcs w -s              
No changes!
zsh: 5434 exit 1     darcs w -s
~/darcs/ghc-bug > darcs apply ~/bug.patch 
Finished applying...
~/darcs/ghc-bug > darcs w -s             
 ./compiler/cmm/CmmBrokenBlock.hs -> ./compiler/cmm/CmmCPSData.hs
A ./compiler/cmm/CmmBrokenBlock.hs
R ./compiler/cmm/CmmCPSData.hs

That is, apply the bundle leaves my working copy with changes in it.  There are
no conflicts.

The patch bundle has two patches in it; applying the patches separately avoids
the bug.  It looks like something related to renaming files: one of the patches
has a rename + some changes to the same file.

I've attached the patch bundle, and I'll attach the GHC tree for reproducing the
bug separately.

----------
files: bug.patch
messages: 1794
nosy: EricKow, beschmi, droundy, simonmar, tommy
priority: bug
status: unread
title: Applying patches leaves changes in working copy

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue494>
__________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug.patch
Type: application/octet-stream
Size: 56231 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20070704/eeff1cdf/bug-0001.obj