[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:00:05 CEST

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

> You nailed the problem on the head ! so how do i merge changes from
> ack1.1 into my_ack which was developed based on ac1.0

that's where the merge comes in. as long as you have access to those
two vendor revisions in an svn repo, it will look like:

  $ svn merge -r1.0:1.1 <vendor URL>

while you're in your working copy. that applies all changes that the
*vendor* made to go from 1.0 to 1.1 to *your* work.

rday

---------------------------------------------------------------------
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:28:10 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.