i thought about something similar to that, but, correct me if I am
wrong, the result of that command would be a diff that would be separate
diffs in one package, meaning a file can appear in more than one place
in the patch. Your solution would work great if my diff/patch parser
was smart enough to combine each instance of a file and calculate the
"final" diff.
Does a tool exist that can view a diff like this? The tool I am using,
I wrote because I found no open source tools that would display a
directory diff in a easy to read form.
-Todd
Moshe Gurvich wrote:
> Try this:
>
> echo "">patchfile; for R in 2:3 3:4 6:7 8:9; do svn diff repo/trunk -r
> $R>>patchfile; done
>
> -----Original Message-----
> From: Todd Stafford [mailto:staffordt@se-core.net]
> Sent: Wednesday, June 21, 2006 11:52 AM
> To: users@subversion.tigris.org
> Subject: creating a patch from multiple revisions
>
> 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
> functionality.
>
> 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?
>
> -Todd
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 21 21:36:41 2006