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

[TSVN] Applying outdated patches

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2004-10-19 15:24:30 CEST


We have quite often the case that we have to apply "outdated" diffs. Why? Because we are delivering bug fixes of our standard sources to our customers and they are using modified (their own modifications) versions of the standard sources.

At the moment, we are evaluating Subversion + Tortoise regarding this problem. We have identified 3 cases:

Content and line number of the customer's source still match the standard source. Possibly modifications are under the bug fix changes. In this case, "Apply Patch" works perfectly and displays the diff view after applying.

The line numbers differ, but the source around the changes is not modified. In this case, "Apply Patch" works and shows the conflict editor after applying.

For some or all changes, the place for the bug fix changes cannot be found. The commandline "patch" command would say "hunk #x failed", apply the hunks that work and write a .rej file. Tortoise does not apply the patch at all. If at least one hunk fails, it's a complete failure. No conflict editor is being shown.

Of course, case 3 is a problem for us. Working with notepad and the .patch file is no option. Why is the commandline "patch" command more powerful than Tortoise here?

We have found the following workaround: If we have the original standard source and the bug-fixed standard source in svn, then we can use Tortoise' "Merge" command to merge the differences between the 2 standard sources into the customer source. In that case, Tortoise shows the conflict editor, applies the applyable hunks and let's us resolve the conflicting hunks visually.

So, the question is: Why does Tortoise not show the conflict editor for applying patches, if the patch fails because of one, some or all hunks? Isn't this the same situation as with "Merge"? Maybe Tortoise has less information then, but the commandline "patch" command still performs better (but not visually).



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 19 16:31:40 2004

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

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