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

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

From: Sven Uhlig <svenuhlig_at_web.de>
Date: Fri, 4 Apr 2014 01:10:05 -0700 (PDT)

Hello,

sorry to bring this thread up again but I think there are still open points.

2013-08-18 06:25 PDT, Stefan Küng:
> On 16.08.2013 09:36, Sven Uhlig wrote:
> > I noticed serveral "inconveniences" when merging from a renamed directory using TortoiseSVN.
> >
> > 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.
> >
> > 2. Merged revisions from original directory are not highlighted as merged in the branch in the merge/log dialog.
> >
> > 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.
> >
>
> I've created issue #538 for this:
> http://code.google.com/p/tortoisesvn/issues/detail?id=538

I have looked into issue #538 and it says in comment #1:
| But those problems are out of TSVNs realm and in the svn library.

I agree that the point 2 could be seen this way because I do not know the internals. I had expected TSVN does the highlight, not svn. Did you forward this to svn?

However I think the points 4 and 5 above are UI issues.

I think Point 4 is because "show all" is a button, not a checkbox.
Point 5 is probably because "hide non-mergeable" is treated as a button, not as a checkbox even though it is a checkbox.

Best regards
Sven.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-04-04 10:10:09 CEST

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