t".
>>
>> I did this;
>> cd /repos/branches/releases/1
>> svn merge ^/trunk --dry-run
>>
>> And subsequently got a status report that everything was going to be a
>> conflict.
>> So I think it's safe to say that the releases branch was
; So I think it's safe to say that the releases branch was created by an OS
> copy and not an SVN aware operation.
>
> is there a pain-free way that I correct my repository to allow for successful
> trunk -> release branch merging?
> I am thinking of;
> * Deleting the rele
s created by an OS copy
and not an SVN aware operation.
is there a pain-free way that I correct my repository to allow for successful
trunk -> release branch merging?
I am thinking of;
* Deleting the release branch;
* Recreating the release branch at the revision that the release branch w
