Re: Retrieve "a" file from a certain revision.

Quoting Gavin 'Beau' Baumanis <beau_at_palcare.com.au>:

> I think it must be one of those days....
> here comes another stupid question....
>
> Despite having just re-skimmed the book... I still can't work it out....
>
> I have my vendor1 branch at;
> branches/vendor1

Hi Gavin,

FWIW, a vendor branch is usually put under ^/vendor, so that it won't
be confused with branches of your own ^/trunk.

>
> I have updated it, by completely overwriting it with the contents of
> the trunk.

Do you mean the contents of the vendor1 trunk? I assume so.

The most efficient way to update a vendor branch is to use a savvy
script that will make the least number of deletes and adds. For
instance, svn-load.

   http://free.linux.hp.com/~dannf/svn-load/

>
> I have now noticed that I had previously made some changes to the
> vendor branch that I require to resurrect, in the vendor branch.
>
> How do I manage to do this?
>
> Consider the repository is now at r7700.
> when I perform;
> svn merge -r 7612:7615 branches/vendor1/ branches/vendor1/

Try adding a peg revision to the merge source arg.

   merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]

In other words,

   svn merge -r 7612:7615 branches/vendor1_at_7612 branches/vendor1

But it's better not to patch the vendor branch itself. A vendor
branch should be used only to capture differences between pristine
releases of the vendor code. Your patched copy of the vendor code
should be elsewhere, such as ^/trunk/3rd-party/vendor1 (that's
where you should apply your merge).

After committing new vendor code to ^/vendor/vendor1, merge the
changes to your patched copy.

   cd /trunk/3rd-party/vendor1
   svn merge ^/vendor/vendor1

Regards,
Steve

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194