[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Inconveniences when merging from renamed source directories/branches in TortoiseSVN 1.8.1 (24570)

From: Sven Uhlig <svenuhlig_at_web.de>
Date: Fri, 16 Aug 2013 00:36:10 -0700 (PDT)

Hello,

I noticed serveral "inconveniences" when merging from a renamed directory using TortoiseSVN. Looking at past discussions the issues seem to exist for some while now. But as they are still there in the latest stable version (1.8.1) I decided to post here anyway.

The situation is as follows:
There are two directories (branches) in the repository. Both have the same original directory name but different revisions because one was a copy before a change, the second was a rename (copy/delete) after a change.

When merging changes from the original directory or the renamed directory into the copied branch, these are the problems I noticed:

1. file not found when trying to merge from original directory (deleted)
Work-Around: merge from new directory. But this causes the next problems.

2. Merged revisions from original directory are not highlighted as merged in the branch in the merge/log dialog.

3. There is no checkbox "hide non-mergeable revisions" in the merge/log dialog if there are only merges from the original directory but not of the renamed one.

4. active "stop on copy/rename", "show all", inactive "stop on copy/rename" does not show revisions from before the copy/rename in the log dialog.

5. active "hide non-mergeable revisions", "show all" does not hide the merged revisions.

Attached to this message there is a repository, a working copy and a text file with detailed steps how to reproduce the problems.

Best regards
Sven.

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

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

Received on 2013-08-16 09:36:16 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.