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 ?
Robert P. J. Day wrote:
>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 Tue Aug 23 19:06:43 2005