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

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

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 18 Aug 2013 15:25:13 +0200

On 16.08.2013 09:36, Sven Uhlig wrote:
> 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.

I've created issue #538 for this:
http://code.google.com/p/tortoisesvn/issues/detail?id=538

I guess adding a way to specify the revision for which to show the log
from (instead of HEAD) solves the problem good enough.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3062910
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-08-18 15:25:24 CEST

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