On Thu, Aug 07, 2008 at 02:19:41PM -0700, Florian Kaufmann wrote:
> My final goal is that I can do the idea of 'cherry picking' also with
> the version control system I am forced to use at my workplace - vss. I
> have cygwin installed, so I have all the gnu tools like diff, diff3
> etc.
Hi Florian,
this question belongs on users_at_subversion.tigris.org
Please re-send there.
This list is meant for discussion about the development
of Subversion itself.
Stefan
>
> As far as I understand, many svn diff/merge/update operations can also
> be done using these gnu tools. E.g. "svn update myfile" is the same as
> getting the base and the head revision of myfile and then do "diff3
> myfile base head".
>
> Now I am asking myself what I have to do to mimic "svn merge". Anyone?
>
> Anyway, I don't understand if svn merge has 3 or 4 input files.
>
> trunk --- 5---...---10---11
> |
> branch \---...---15
> |
> working X
>
> Say I want to merge the changeset 11 into my working copy which's base
> is 15. Now does svn merge also look at the common anchestor 5?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-08 16:56:00 CEST