I don't do a lot of branching and merging, but I had been working some
changes this weekend that wasn't quite ready to include in trunk, but
none the less wanted to get them into source control so I decided to
create a branch from my working copy. No problems so far.
We have quite a few cooks in the kitchen at the moment so I didn't
want to get far too far behind with the changes happening on the trunk
so after finishing and committing up my latest changes I wanted to
merge the latest changes from trunk to my working copy. So I selected
merge range of revisions and specified the trunk as the url to merge
from and left the revision range to merge blank (from revision on
which branch was created).
My working copy seemed to update successfully and after some initial
testing all seemed good. Before doing anything else I wanted to
commit the changes. Commit however failed.
In one folder there were 2 files one of which was deleted and the
other was changed. SVN apparently had marked the folder as replaced
and kept giving me the error that my working copy was out of date.
I'm not entirely sure what was going on here, but I assume it has
something to do with the folder being marked as "Replaced". I don't
know if this means some one deleted it in the trunk and then readded
it, but I don't see any evidence of this in logs on trunk so I don't
think so. In any event I managed to fix the issue copying the file
out of the folder, perform update and then copy file back into folder
to overwrite existing. After fixing this issue the commit was
successful. Any ideas why this happened, what if anything I should
have done differently? After inspecting the properties I also noticed
that this file was marked as a binary for some reason, don't think it
should have mattered but thought I would throw it out there in case it
does for some reason.
After committing my changes I noticed for some reason my working copy
still reported it had uncommitted changes, at first I thought explorer
had not yet updated the icons as happens frequently but after clicking
check modifications there was a list of files that were marked as
added. However, if I look in the repo browser the file was committed
into my branch, trying to commit the change anyway caused an error
stating that file already existed or something. This must be a bug
of some sort, but I wasn't sure the best way to resolve it. I ended
up deleting the folder and then performing an update to download files
from repository again.
Another thing I noticed is that svn:merge-info seemed to be added on a
lot of files that weren't even modified, but not on all files
either... I am at a loss to determine why some files were labeled and
not others. Any ideas?
I generally avoid branching and merging since I tend to run into
issues like this when I do. Am I doing something wrong here? any
tips for making my merge experience more enjoyable and/or tips to work
around these issues?
Thanks,
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1216407
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-23 21:42:25 CET