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

Re: Advanced patch creation.

From: kurtharriger <kurtharriger_at_gmail.com>
Date: Tue, 20 Apr 2010 15:34:13 -0700 (PDT)

That works for specific revision, but not for a range of revisions.

- Kurt

On Apr 20, 1:27 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> On 20.04.2010 21:17, kurtharriger wrote:
>
>
>
>
>
> > This is easy to do with the command line tool (cygwin)
>
> > svn diffhttps://.../trunk%c2%a0-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 thepatchto apply against the upstream repository.
>
> > Personally, I would find it very useful to be able to export apatch
> > from the log by selecting the revision(s), right click, create
> >patch...
>
> Well, there's no "createpatch" 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&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
>
> --
> Subscription settings:http://groups.google.com/group/tortoisesvn/subscribe?hl=en

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2590890

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-21 02:35:34 CEST

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

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