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

creating a patch from multiple revisions

From: Todd Stafford <staffordt_at_se-core.net>
Date: 2006-06-21 20:51:48 CEST

I am currently trying to design a script that will create a patch file
that contains the diff on changes made based on multiple revisions.
These revisions are not consecutive. I have not seen any documentation
saying how to perform this action using the repository. The use case is
that some developer created new functionality and those revisions are
for that work. The work needs to be reviewed. But we do not want other
work showing up in the diff. This would also be nice to promote work
from the trunk to the stable branch. My current implementation is:

say I want to get a patch of rev 3, 4, 7, 9, and 14.

svn checkout -r 2 repo/trunk (at lowest possible level)
svn merge -r 2:3
svn merge -r 3:4
svn merge -r 6:7
svn merge -r 8:9
svn merge -r 13:14
svn diff > patchfile

So now the patchfile contains the changes made for the specific new

the checkout is going to be the most time consuming part, our trunk is
over a gig, and based on the files that were changed, we may need to
diff at the highest level. Obviously something server side would be
best, to eliminate the need to perform the checkout.

Does anyone have any tricks to perform this action, and not be possibly
bogged down with a lengthy checkout?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 21 20:54:18 2006

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

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