> 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.
> >
>
> 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.
Thank you for the quick update. I see you have introduced a new bug with this change ;-)
https://code.google.com/p/tortoisesvn/issues/detail?id=547
Unfortunately the items 2, 3, 4 and 5 above have not improved with this update.
For items 2 and 3 I guess svn:mergeinfo is not parsed/handled correctly after a copy/rename.
For items 4 and 5 I guess the checkboxes are not considered at all or not correctly if combined.
Best regards
Sven.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3063727
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-02 10:25:21 CEST