Search code examples
svndiffbranch

SVN: Create a diff for lots of revisions

I had a private branch that I did a ton of commits to, then I merged it into trunk, and did a few little tweaks there.

Now the trunk maintainer wants a diff off all of my changes incase we need a rollback.

How can I create this? If you need numbers for your examples, assume that

224446

was my main revision where I merged into trunk,

224453 and 224462

were my minor fixes, and I have countless changes when in my private branch.

Solution

  • One possible procedure would be to do this:

    1. Create diffs for 224453 and 224462 (e.g. by svn diff -r 224452:224463 > diff1.patch).
    2. Check out 224446 (svn up -r224446)
    3. Apply the diffs (e.g. patch -p0 -i diff1.patch)
    4. Create a diff of that against 224445 (svn diff -r 224445 > diff2.patch)