Login | Register
My pages Projects Community openCollabNet

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

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

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

Author Gavin Lambert <tsvn at mirality dot co dot nz>
Full name Gavin Lambert <tsvn at mirality dot co dot nz>
Date 2017-09-01 18:02:12 PDT
Message 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.)

« Previous message in topic | 2 of 2 | Next message in topic »

Messages

Show all messages in topic

Bug: Revision from which branch was created shows as not emrged adamconway Adam Conway 2017-08-14 06:12:42 PDT
     Re: Bug: Revision from which branch was created shows as not emrged Gavin Lambert <tsvn at mirality dot co dot nz> Gavin Lambert <tsvn at mirality dot co dot nz> 2017-09-01 18:02:12 PDT
Messages per page: