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

Re: Bug: Revision from which branch was created shows as not emrged

From: Gavin Lambert <tsvn_at_mirality.co.nz>
Date: Thu, 31 Aug 2017 15:22:56 +1200

On 15/08/2017 01:12, Adam Conway wrote:
> To reproduce:
>
> 1. Create a branch branches/foo
> 2. Commit something to it. Let's say this gets revision 100
> 3. Right-click in working copy and select Show Log
> 4. Right-click top revision on that branch and choose Create branch/tag (so we are creating from that specific revision, not from repo top) and create branches/bar
> 5. Commit some else to branches/foo (revision 101)
> 6. Checkout branches/bar
> 7. In branches/bar, right click, select SVN Merge
> 8. Click next to get to "Merge revision range" screen
> 9. Click Show log
> 10. Check Stop on copy/rename
>
> Expected: I have one revision showing as mergable (r101) since the branch was created from r100 and includes it's changes
>
> Actual: Both r101 and r100 show as mergable.

IIRC, this is a performance thing.

Try setting LogFindCopyFrom to true in the Advanced Settings and see if
it fixes it.

(I really think that should be the default. I always turn it on and
I've never noticed any performance issues, even with a huge repo.
Although it does still sometimes get defeated by complex branch structures.)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-09-02 03:04:27 CEST

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