Earlier, I wrote: > > cvs rdiff -u -r1.1.1.4 -r1.2 \ > > src/external/bsd/libarchive/dist/libarchive/archive_read.c > > What kind of sorcery is this? Why is the diff not relative to 1.1?
To answer my own question, "vendor branch sorcery". What confused me about this in the first place was that if you look at the history of this file in cvsweb, at http://cvsweb.netbsd.org/bsdweb.cgi/src/external/bsd/libarchive/dist/libarchive/archive_read.c?only_with_tag=MAIN it says "Diff to previous 1.1 (colored)", and if you click on that, you see a diff that's much larger than the upstream patch at https://github.com/libarchive/libarchive/commit/ec5b86b48e99c5501374b01606f1ccdae6a8a93e.patch Bug in cvsweb? -- Andreas Gustafsson, g...@gson.org
