New submission from Robert McQueen <[EMAIL PROTECTED]>: Hi folks,
I've got two repositories, one is the project trunk: http://projects.collabora.co.uk/~robot101/gabble-trunk.tar.bz2 and one is the result of merging a branch to trunk: http://projects.collabora.co.uk/~robot101/gabble-branch-merged.tar.bz2 I'm using darcs 1.0.8. Both repositories are apparently consistent (darcs check doesn't complain, darcs repair does nothing). When I try to push the merged branch into trunk, I get this error: darcs failed: Error applying patch to recorded! Running 'darcs repair' on the target repository may help. user error (Error applying hunk to file ./src/vcard-manager.c) Repairing the target repository then gives me this: Applying patch 1838 of 1838... done. different file lengths for /home/robot101/public_html/gabble-merged-cmlib-10/_darcs/pristine/src/gabble-connection-manager.c and /home/robot101/public_html/gabble-merged-cmlib-10/_darcs/newpristine/src/gabble-connection-manager.c Fixing pristine tree... But the same error (as above) still happens when pushing. I've worked around the error by unrecording the patch which made the branches conflict in the first place, and recording the change in a fresh patch, but the tarballs above preserve the irreconcilable state. Regards, Rob ---------- messages: 1451 nosy: EricKow, beschmi, droundy, robert.mcqueen, tommy status: unread title: error applying patch to consistent repository ____________________________________ Darcs issue tracker <[EMAIL PROTECTED]> <http://bugs.darcs.net/issue402> ____________________________________ _______________________________________________ darcs-devel mailing list [email protected] http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
