AW: merging multiple revisions

Hi Bob,

thanks for your answer. I used tortoise 1.6.16 and upgraded to latest 1.7.3 version, which gave me a worthful hint. So my previous merge seems to be left incomplete. End of merge dialog 1.6.16 reported conflicts. I solved them and commited changes. But 1.7.3 reported at end of merge to re-run merge command after resolving conflicts. After a cascade of merge-and-resolve steps the workspace and repository had same layout after commit.

I think it is very dangerous when an incomplete merge is commited to repository, because local working copy and repository differ. The only resolution to resolve such conflict is to delete working copy and checkout it again. I was sure the merge was correct because my working copy was running. Any of my colleagues got a different working copy from repository, which was not running. Subversion/Tortoise did not detect this inconsistency, even after several updates from repository. Also deletion of some local project folder and manual restore by svn-update did not resolve the problem.

Regards,
Markus

-----Ursprüngliche Nachricht-----
Von: Bob Archer [mailto:Bob.Archer_at_amsi.com]
Gesendet: Freitag, 6. Januar 2012 18:48
An: users_at_tortoisesvn.tigris.org
Betreff: RE: merging multiple revisions

> 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'm not sure I really follow what you are saying. First, files don't have revisions. So, a file in revisions 22 and 23 and 24 could all be identical.

As far as how you get a higher revisions number in your working directory than Is in the repository I can't understand. Was the repository possible restored from an older backup to cause this?

> 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?!

I've never seen this issue. But, if you can come up with a script or batch file that can show this happening and post it to the svn list people will help you with it.

Unless you are talking about cyclic merges which may explain the issue. If you are merging back and forth switching from/to paths this situation might occur.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2906586

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2907157

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-01-09 09:31:43 CET