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

Re: Merge -> Show Log -> grey out (1.8.5)

From: Martin Bischoff <tinu44_at_gmail.com>
Date: Thu, 13 Mar 2014 22:12:23 +0100

On Thu, Mar 13, 2014 at 4:33 PM, Ben Fritz <fritzophrenic_at_gmail.com> wrote:

> On Wed, Mar 12, 2014 at 1:40 PM, Stefan Küng <tortoisesvn_at_gmail.com>
> wrote:
> > On 12.03.2014 18:55, Mario Santos wrote:
> >> Hello,
> >>
> >> I created a new branch at revision 1000. When merging from trunk, the
> revisions before 1000 aren't greyed out.
> >>
> >> The help says they should be.
> >>
> >> I am using TortoiseSVN 1.8.5
> >
> > You have to go to Settings->Advanced first and set the value for
> > LogFindCopyFrom to true.
> >
>
> This feature sounds cool! So, I tried it out by enabling that setting
> in the Settings->Advanced dialog.
>
> Enabling this setting doesn't seem to have any effect, even after
> deleting the log cache.
>
>
For me the option LogFindCopyFrom works, but
- it doesn't grey out the revisions from before the branch creation
- when I click "Hide non-mergeable revisions" in the show log dialog, then
the revisions from before the branch creation as well as the already-merged
revisions are hidden

I have a slightly more complex situation, in which I'm experiencing the
same problem as the OT, and where the LogFindCopyFrom doesn't help:

- I created branches/1.x from trunk_at_r100
- some bugfixes were then merged from trunk to branches/1.x
- at some later time, I created branches/1.1.x from branches/1.x_at_r150

Now when I want to merge bugfixes from trunk to branches/1.1.x I get the
same problem:
- the show log dialog shows all revisions of trunk
- revisions which were merged directly to branches/1.1.x or to branches/1.x
(before branches/1.1.x was create) are grayed out
- revisions from before the creation of branches/1.x are shown in the log
dialog, even when selecting "Hide non-mergeable revisions"

Is there any solution for that situation? Is there a way to find the
differences between /trunk and /branches/1.1.x?

--Martin

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-03-13 22:12:29 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.