Hi Stefan,
On 27/05/2009, at 10:50 PM, Stefan Sperling wrote:
> 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;
>> branches/vendor1
>>
>> 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:
>
> cd working-copy-of-vendor-branch
> 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?
> Stefan
I tried your command but got the following error;
svn: '^/branches' is not a working copy
svn: Can't open file '^/branches/.svn/entries': No such file or
directory
I have subsequently managed to get the results I was after - albeit in
a convoluted manner.
In a previous post by Stephen Butler he suggested a repo
reorganization that would allow for a greater "freedom" (for want of a
better of word) with respect to managing our vendor branches.
I am sure there are several ways that would all be better than the
scenario we currently have in operation - his idea was simple to
implement and simple to administer too - so that struck a chord with me.
Anyway - thanks for the reply - I appreciate the help.
Gavin.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2357043
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-30 04:14:17 CEST