Re: rdiff
"Paul Edwards" <[email protected]>
| Newsgroups | gmane.comp.version-control.cvs.bugs |
|---|---|
| Organization | BigPond Internet Services (http://www.bigpond.net.au) |
| Message-ID | <5%[email protected]> |
"Derek Robert Price" <[email protected]> wrote in message news:[email protected]... > Regardless, I looked into it myself and I think the correct patch is > more like the following: Looks almost good. > @@ -596,6 +591,18 @@ > * lines of the diff output file, and munge them to include more > * reasonable file names that "patch" will understand. > */ > + if( patch_short ) I would have included this block before the comment line, as the comment doesn't apply to it. > + { > + cvs_output( "File ", 0 ); > + cvs_output( finfo->fullname, 0 ); > + cvs_output( " changed from revision ", 0 ); > + cvs_output( vers_tag, 0 ); > + cvs_output( " to ", 0 ); > + cvs_output( vers_head, 0 ); > + cvs_output( "\n", 1 ); > + ret = 0; > + goto out2; And this should be out, not out2, in order to get the right cleanup, I believe. The wonderful world of gotos - clear as mud. > The sanity.sh tests pass with this patch, but your cases do not appear > to be tested. Could you write some sanity.sh test cases for an added > file, a removed file, a file with no differences between releases, and a > file which exists but was not in either release, so that I may commit > this? It would probably be simplest to just add a new test set, > rdiff-add-remove-nodiff or the like. I'll see if I can do this. BFN. Paul.