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

Re: Vendor drop management

From: Robert P. J. Day <rpjday_at_mindspring.com>
Date: 2005-08-23 19:07:08 CEST

On Tue, 23 Aug 2005, Rupinder Singh Mazara wrote:

> forgive me for sounding stupid
> but
> a) i checkout a new sandbox let say /home/me/svn_sandox/tmp_sandbox
> b) with the sandbox is issue
> svn merge -r1.0:1.1 <vendor URL>
> c) that should update my sandbox tmp_sandbox with the vendor changes from 1.0
> to 1.1 ?

that's the theory -- you'll be merging the vendor changes into your
working copy. if that works, you'll effectively have vendor revision
1.1, still with all your changes.

read that section of the book for possible complications.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 24 15:38:12 2005

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

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