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

cherry picking without subversion

From: Florian Kaufmann <sensorflo_at_gmail.com>
Date: Thu, 7 Aug 2008 14:19:41 -0700 (PDT)

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

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
Received on 2008-08-08 16:48:40 CEST

This is an archived mail posted to the Subversion Dev mailing list.

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