Ben Collins-Sussman wrote:
>
> On Mar 2, 2005, at 6:11 AM, Robin Becker wrote:
>
>> Client win32 1.1.2, server freeBSD 1.1.1.
>>
>> I have a set of trunk changes which I wish to apply to a branch.
>>
>> In the freshly checked out branch I do
>>
>> svn merge -r15822:HEAD https://192.168.0.6/svn/private/trunk
>
>
> Should this set of changes apply 'cleanly' to the branch? In other
> words, is r15822 the revision in which the branch was born?
no that is the last time I merged changes from the trunk.
No changes have been made to the branch since. So far as I know
trunk and branch were separated at birth. Merges from the trunk have been
carried out periodically.
Even if the changes aren't 'clean' I don't see why merge can't skip or clash.
>>
>> The merge keeps failing with a Working copy users/xxx not locked.
>>
>> I tried removing users from the branch and that fails dismally. It
>> seems as though the merge is faili to create folders which it needs to
>> inspect/change.
>>
>
> "Removing users from the branch"? I don't understand.
I thought that removing the folder containing the clash from the target branch I
might make svn's task easier, but even when ingnoring ancestry it seems to
continue worrying about changes that aren't visible in the target.
> Can you please show us detailed transcripts of the command and output.
> And give more information on the history here.
C:\code>svn co https://192.168.0.6/svn/private/branches/version2 version2_private
A version2_private\p.....
U version2_private\p
.....
A version2_private\presales\huig\demo\00readme.txt
Checked out revision 16418.
C:\code>cd version2_private
C:\code\version2_private>svn merge --ignore-ancestry -r15822:HEAD
https://192.168.0.6/svn/private/trunk
U conferencekit\confkitproj\heartbeat.py
U conferencekit\confkitproj\confkit\actions.py
.......
C ...
........
A users\william\cgi-bin\cvbuilder.cgi
svn: Working copy 'users/chris' not locked
C:\code\version2_private>
users\chris doesn't seem to be in the branch, but was created in the trunk at
14331 as an empty folder. Since then in the range of my requested changes
subfolders dissertation etc etc were created starting at 16353.
The main branch changes
r13172 copied from trunk
r15350 merged trunk 13312:15349 should have created users chris, but didn't.
r15771 15350:15769 Presumably some changes were skipped here
r15823 15769:15822 and here.
I suppose that svn is incapable of making up a container if it isn't present.
Even so shouldn't it just skip changes it cannot apply?
--
Robin Becker
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 2 16:55:41 2005