On 20.04.2010 21:17, kurtharriger wrote:
> 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...
Well, there's no "create patch" entry in that context menu. It's named
"create unified diff" instead, but it does what you want.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2590747
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-20 21:27:24 CEST