On Wed, May 27, 2009 at 08:27:15PM +1000, Gavin 'Beau' Baumanis wrote:
> 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;
> I have updated it, by completely overwriting it with the contents of
> the trunk.
> 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/
It looks like both paths are working copy paths?
I think you need a URL in there.
It's always a good idea to view a diff before merging, so that
you'll see whether the changes you are about to merge make sense.
Try something like this:
svn diff -r7612:7615 ^/branches/vendor1
Note that by using the ^ notation a URL is specified.
If the changes that diff shows you are the ones you'd like
to apply to your working copy, run a merge:
svn merge -r7612:7615 ^/branches/vendor1
Did this help?
Received on 2009-05-27 14:51:45 CEST