Still unexperienced in using svn/subclipse...
until know I've mainly jumped back and froth from tag to branch,
everytime I try putting back all I've worked on into the trunk
I run into some problems...
- copied from branch to tag
switching to newly created tag
--------------------------------------------------------------
- switched to trunk to do merge of the code from this last tag
switch file:///svn_repositories/svn_proj/trunk C:/Users/gio/Documents/Flex Builder 3/proj_folder -r HEAD --force
...
Updated to revision 159.
===== File Statistics: =====
Deleted: 56
Added: 138
Updated: 13
==== Property Statistics: =====
Conflicts: 1
returns one conflict on the folder containing all... encountered this before (it was for the subclipse tag properties... was sufficient to edit them to have them equal to the last version...)
--------------------------------------------------------------
- launched dry run of the merge...
merge --dry-run --depth=infinity -r127:HEAD file:///svn_repositories/svn_proj/tags/0.1.9 C:/Users/gio/Documents/Flex Builder 3/proj_folder
...
Dry-run merge complete.
===== File Statistics: =====
Conflicts: 2
Deleted: 35
Added: 317
Updated: 14
==== Property Statistics: =====
Conflicts: 3
this was the message that gave me also the other times. usually it gives me a number of conflicts equal to the number of tags/branches I let pass between merges to the trunk. As said before the other times I've just touched the subclipse tags properties to have them complete to the last version, marked resolved and all went fine. (If i recall it right there was also an update involved after...)
--------------------------------------------------------------
Now if I try the actual merge it returns an error...
merge --depth=infinity -r127:HEAD file:///svn_repositories/svn_proj/tags/0.1.9 C:/Users/gio/Documents/Flex Builder 3/proj_folder
Attempted to lock an already-locked dir
svn: Working copy 'C:/Users/gio/Documents/Flex Builder 3/proj_folder' locked
Merge completed abnormally.
--------------------------------------------------------------
I read that it's possible to get rid of locks with a cleanup
so i tried it
cleanup C:/Users/gio/Documents/Flex Builder 3/proj_folder
Problem running log
svn: In directory 'C:/Users/gio/Documents/Flex Builder 3/proj_folder'
svn: Error processing command 'append' in 'C:/Users/gio/Documents/Flex Builder 3/proj_folder'
svn: Missing 'dest' attribute in 'C:/Users/gio/Documents/Flex Builder 3/proj_folder'
--------------------------------------------------------------
Ok, this is giving me problems. I know, i have to study well how all the subversion stuff works and especially how to handle conflicts, but for now I thought to get back to my work and figure it out in another (more quiet) moment. so I issued a switch command to return to my last tag version and go on working
switch file:///svn_projs/montecore_svn/tags/0.1.9 C:/Users/gio/Documents/Flex Builder 3/proj_folder -r HEAD --force
Attempted to lock an already-locked dir
svn: Working copy 'C:/Users/gio/Documents/Flex Builder 3/proj_folder' locked
--------------------------------------------------------------
and again the cleanup doesn't work...
so the dir is locked
and I now can't merge and can't even go back to the tag I was working on...
How am I supposed to solve this?
How can I remove the lock? Something else other than cleanup?
Is there something that explains well and in depth how
to deal with the 'merge in trunk' process and all the conflict
resolution issues (in svn and subclipse...), so I can stop bothering
you with these questions?
Thanks in advance
Gio
__________________________________________________________
Not happy with your email address?.
Get the one you really want - millions of new email addresses available now at Yahoo! http://uk.docs.yahoo.com/ymail/new.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-07-19 11:55:58 CEST