[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: hiccups by patch program?

From: Markus Elfring <Markus.Elfring_at_web.de>
Date: 2007-01-06 01:42:12 CET

> But you ask me about the also very well-known Subversion?

Yes - and its relationship to unexpected conflicts with the results of the
patch command.

> There must be some error message their tool throws out.

The message by the patch tool was like "Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- saving rejects to file ..."

> The simple information "rejected" without knowing
> why doesn't help at all but only wastes time trying to find out why.

The patch tool that is the primary authority for the other developers
rejected something. I assume that I have not got proper arguments to convince
them to look again into the specific details of the intended updates.
   - If you think that one tool does its work correctly, you would try to
avoid the effort to play with suspicious changes from a second tool like
"TortoiseSVN" because clean patches are expected.

> What do I see here? All that link shows me is the content of a c file.

Yes. If you look at the code instructions with the rejected lines in mind,
you'll see that the suggested changes might indicate useful refactorings.

> What should I do now? Guess how a patch would look like? Against what?

I have got doubts that I can really avoid dubious reject files.

> You know that I don't know anything about the project you're working
> on here?

I guess this knowledge is not required in this case. - We are discussing
a fundamental development or programming problem.
Tool A generated some data that appeared to be consistent. Tool B seems to
detect potentially open issues. Which software does say the right thing?

> Seriously: please provide specific information that's related to
> the problem.

It has got to do with the following wording from the specification.
If no location can be found, the patch utility will append the hunk to the
reject file. The rejected hunk will be written in context-difference format
regardless of the format of the patch file.

I am looking for an explanation to the observed mismatch or potential
version conflict. It seems that I don't get this from a sample reject file.

> Do you really think as a software developer I don't know what that is?

I'm sorry - I didn't know that your are a developer.
I am unsure if false positives are possible in the context of patch resolution.


To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sat Jan 6 01:42:35 2007

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.