This is easy to do with the command line tool (cygwin)
svn diff https://.../trunk -c 42486 > 42486.patch
Personally, I dislike using merge. I tend to get lots of conflicts on
folders and files that should not have been even changed. I realize
that this is due to the svn:mergeinfo property but it makes it
difficult to sort out which files were actually changed and in a team
some developers don't understand this and update only the changed
files reverting everything else which causes issues next time a merge
is preformed. Even simple merges seem to become complex when using
tortoise svn merge tool. We found it much easier to create and apply
patches and include the revision number in our comments. We can then
extract the revision number from our logs to find missing revisions if
necessary.
Another common use I have for this is when working with an upstream
open source repository. I often copy the trunk into our repository
and make changes there as necessary. I then use svn diff -c or -r to
extract the patch to apply against the upstream repository.
Personally, I would find it very useful to be able to export a patch
from the log by selecting the revision(s), right click, create
patch...
- Kurt
On Mar 12, 5:20 pm, Simon Large <simon.tortoise..._at_googlemail.com>
wrote:
> On 12 March 2010 21:52, Todd Gleason <Todd.Glea..._at_elekta.com> wrote:
>
>
>
>
>
> >> -----Original Message-----
> >> From: Simon Large [mailto:simon.tortoise..._at_googlemail.com]
> >> Sent: Thursday, March 11, 2010 2:41 AM
> >> To: us..._at_tortoisesvn.tigris.org
> >> Subject: Re: Advancedpatchcreation.
>
> >> On 11 March 2010 07:21, Eyal Bar-lev <eyal.bar..._at_gmail.com> wrote:
> >> > Hello.
> >> > Great tool , first of all.
> >> > Second:
> >> > I would like to know :
> >> > Is there a possibility to add an option to thepatchcreation dialog
> >> to
> >> > create apatchfrom a checked in version which is not necessarily the
> >> last
> >> > one ?
> >> > For Instance :
> >> > We checked in our project at version 1024.
> >> > I split a branch for some development I need and checked in lots of
> >> code,
> >> > and now I am at version 1053
> >> > I would like to create apatchwhich will reflect all differences as
> >> of
> >> > version 1041, for instance because the rest of the team has this
> >> version of
> >> > the branch. What I do today is to do a unified diff and then remove
> >> all the
> >> > absolute paths from there. Is there a way to integrate it to the
> >>Patch
> >> > creation tool, and add the version from which the diff was made as a
> >> default
> >> > to the file name of thepatch?
>
> >> Why don't you use merge for this instead ofpatch?
>
> > Maybe you want to save thepatchaway for some time and for whatever reason don't want to commit it. Or maybe you don't have access to Svn and need to send it to someone to submit at a later time, and they want to wait for approval (which could take days or weeks or more) before they even look at thepatchfile.
>
> But the OP is asking for a diff between two already committed
> revisions, which is different from the scenarios you are presenting.
>
> It can be done - show log, select 2 revisions, show difference as
> unified diff, save unified diff as - but why would you want to do that
> in order to port changes from one branch to another. Unless the other
> developers don't have read access to the branch that thepatchis
> created from. Merge is made for the job,patchis not.
>
> Simon
>
> --
> : ___
> : oo // \\ "De Chelonian Mobile"
> : (_,\/ \_/ \ TortoiseSVN
> : \ \_/_\_/> The coolest Interface to (Sub)Version Control
> : /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2590738
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-20 21:21:57 CEST