Jamie Webb wrote:
On Sat, Aug 13, 2005 at 07:53:41PM +0200, VMiklos wrote:
i've read previously on this list that the current diff algorithm is
mainly based on file sizes.
I don't know where you read that, but it's not the case. By default
Darcs uses modification times. If you use the --ignore-times flag, it
does a full diff.
you're right, i don't know where i read that then. and yes,
--ignore-times flag helps here, thx
1) if failed to apply the patch
currently: the patch dumped to stdout without any comment, if you run
-v, then you're informed that the patch failed to apply and you're told
the predestine and the working patch
AFIAK, a failure of this sort is not normal. It implies a bug in
Darcs, and there should be some text above the patch contents
indicating this. You should check that you are running the latest
version of Darcs (1.0.3 or 1.0.4pre2), and if the problem is still
present, post a terminal transcript demonstrating it here (I tried
following your description and it worked fine for me).
i don't know when this appers without using touch, but with touch you
can easily reproduce the bug:
1) darcs get http://factory.frugalware.org/~vmiklos/darcs/
2) darcs unpull the 'foo->bar' patch
3) sed -i 's/foo/baz/' foo.c
4) touch --date="foo" foo.c && touch --date="foo" _darcs/current/foo.c
5) darcs pull
the output:
Error applying patch to working dir.
Pristine patch is:
{
[foo->bar
VMiklos <[EMAIL PROTECTED]>**20050816084537] {
hunk ./foo.c 1
-#include <foo.h>
+#include <bar.h>
}
}
Working patch is:
{
{
[foo->bar
VMiklos <[EMAIL PROTECTED]>**20050816084537] {
hunk ./foo.c 1
-#include <foo.h>
+#include <bar.h>
}
}
{
}
}
after 'touch foo.c':
We have conflicts in the following files:
./foo.c
Finished pulling and applying.
so it would be good if 'failed to apply tha patch', then the after the
current 'darcs what' a 'darcs what --ignore-times' would be run
udv / greetings,
VMiklos
--
Developer of Frugalware Linux, to make things frugal - http://frugalware.org
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
