I have trouble with repository-/workspace state after complex merge
operation. I am merging a specified set of changes from trunk to branch
with the tortoise default merge settings. The main development is done
in trunk, the branch was forked from trunk as has minor changes. In
trunk under /myProject/... several subprojects had been created. Some of
them were deleted or replaced. Now, I am starting the merge operation,
which is running quite long. After some time my workspace contains the
correct merge result. Changes are commited. A different user checks out
the repository (the very first time) to create its workspace and sees
different data: the repository contains my changes in a single commit
operation, but the revision of some file differ from my workspace. Also
my local workspace contains newer revisions than the repository. In one
case there is newer revision of a directory in my workspace than in the
svn repository.
I assume in some (but not all) cases tortoise/svn-client has problems in
merge operations applying ADD and REMOVE to same resource, e.g. a
resource is added to svn and removed by a later revision. Probably
cascades of ADD-REMOVE to svn resources may result in such conflicts.
Because of the commited workspace differing from respoitory this seems
to be a svn bug?!
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2906564
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-01-06 15:57:35 CET