darcs

Issue 2251 darcs diff filename fails with " replace patch to ./foo.c couldn't apply."

Title darcs diff filename fails with " replace patch to ./foo.c couldn't apply."
Priority Status needs-diagnosis/design
Milestone 2.12.0 Resolved in
Superseder Nosy List bfrk
Assigned To
Topics

Created on 2012-10-04.12:32:20 by bfrk, last changed 2016-04-01.17:21:48 by gh.

Files
File name Uploaded Type Edit Remove
darcs-issue2251.tar.gz bfrk, 2012-10-05.15:01:52 application/gzip
Messages
msg16213 (view) Author: owst Date: 2012-10-05.08:13:27
Ben emailed me directly, so I'll attach the report for him - I'll try
and get someone to investigate if we've got some infrastructure issues
preventing his use of the tracker.

-- 

1. Summarise the issue (what were doing, what went wrong?)

> darcs diff test/validate/testSupport.h

darcs failed:  replace patch to ./src/snc/gen_ss_code.c couldn't apply.

Note the file it complains about is not teh one I gave on the command line.
(It's in the same repo, though).


2. What behaviour were you expecting instead?

This one:

> darcs-2.8.0 diff test/validate/testSupport.h
--- old-work/test/validate/testSupport.h        2012-10-04 14:36:35.0000000=
00
+0200
+++ new-work/test/validate/testSupport.h        2012-10-04 14:36:35.0000000=
00
+0200
@@ -9,12 +9,15 @@

 #include "epicsThread.h"
 #include "epicsMutex.h"
+#include "epicsEvent.h"
 #include "epicsUnitTest.h"

 #ifdef __cplusplus
 extern "C" {
 #endif

+extern epicsEventId this_test_done;
+
 void run_seq_test(seqProgram *seqProg, int adapt_priority);
 void seq_test_init(int num_tests);
 void seq_test_done(void);


Yes, this means it worked in darcs-2.8.0.


3. What darcs version are you using?

I am using the latest and greatest from the screned repo (2.9.5 + 33 or so
patches).

4. What operating system are you running?

Ubuntu 12.04 (64 bit)
msg16215 (view) Author: bfrk Date: 2012-10-05.13:46:38
Thanks, Owen, for helping out. I am using Firefox now (before used
Konqueror), maybe that works better.

I wanted to add that this happened after I unrecorded a large patch.
Also, to aid debugging, I can give you a tar ball of the repo where this
happened.
msg16216 (view) Author: owst Date: 2012-10-05.13:54:04
Hi Ben,

Yes, a tarball would be most useful, to allow us to distil a minimal
example of this behaviour.

Cheers,
Owen.
msg16217 (view) Author: bfrk Date: 2012-10-05.15:01:52
Here we go.
Attachments
msg16402 (view) Author: markstos Date: 2012-12-13.14:10:31
This issue looks like it has as much to do with "replace" as "diff". 
Updating title accordingly.
msg19083 (view) Author: bfrk Date: 2016-03-15.20:36:35
BTW, this bug is still open. I just reproduced the problem with
darcs-2.10.3.
History
Date User Action Args
2012-10-04 12:32:20bfrkcreate
2012-10-04 12:44:33owstsetmessages: + msg16200
2012-10-04 12:46:52bfrksetmessages: + msg16201
2012-10-04 12:48:27bfrksetmessages: + msg16202
2012-10-04 12:50:23bfrksetmessages: + msg16203
2012-10-04 12:50:42bfrksetmessages: + msg16204
2012-10-04 12:54:23owstsetmessages: + msg16205
2012-10-04 12:54:33owstsetmessages: - msg16204
2012-10-04 13:37:42bfrksetmessages: + msg16206
2012-10-04 13:47:22owstsetmessages: + msg16208
2012-10-05 00:00:45bfrksetmessages: + msg16212
2012-10-05 00:01:22bfrksetmessages: - msg16212
2012-10-05 00:01:28bfrksetmessages: - msg16199
2012-10-05 00:01:45bfrksetmessages: - msg16202
2012-10-05 00:01:55bfrksetmessages: - msg16203
2012-10-05 08:13:29owstsetmessages: + msg16213
2012-10-05 13:46:40bfrksetmessages: + msg16215
2012-10-05 13:54:05owstsetmessages: + msg16216
2012-10-05 13:54:20owstsetmessages: - msg16200
2012-10-05 13:54:23owstsetmessages: - msg16201
2012-10-05 13:54:26owstsetmessages: - msg16205
2012-10-05 13:54:29owstsetmessages: - msg16206
2012-10-05 13:54:33owstsetmessages: - msg16208
2012-10-05 15:01:54bfrksetfiles: + darcs-issue2251.tar.gz
messages: + msg16217
2012-12-13 14:10:31markstossetmessages: + msg16402
title: darcs diff filename fails with strange error message -> darcs diff filename fails with " replace patch to ./foo.c couldn't apply."
2016-03-15 20:36:37bfrksetstatus: unknown -> needs-diagnosis/design
messages: + msg19083
2016-04-01 17:21:48ghsetmilestone: 2.12.0