RE: Re: Re: Re: Merge log and natural history

On Jul 10 2014, quoth Ben Fritz:
> > In my testing, the natural history revisions are not hidden. With that checkbox ticked and "stop on copy" unticked, I can still see all the way back to revision 1. It's probably just hiding the greyed out revisions only, so the same underlying problem is affecting both.
>
> No, they actually get hidden if they come before the branch as well.
> Or at least, they did in 1.8.5:

I tested in both 1.8.2 and 1.8.7 and saw the same behaviour in both: I do have LogFindCopyFrom set to true, but revisions prior to branch creation are neither greyed out nor hidden by ticking the checkbox.

I suppose it's possible that the particular branch I'm testing is confusing TSVN; it was originally copied from trunk, and since then has been recopied twice more (actually renaming). "Stop on copy" stops at the most recent renaming, which is *not* the branch creation, and not the branch I'm trying to merge from, which is why I turn that off.

If it's not already doing this, LogFindCopyFrom needs to find whenever it was copied from *the branch that I am trying to merge from*, even if that means tracking through multiple copies (it's all information available in the log anyway).

(Also, I'm puzzled why throughout multiple threads over multiple months I almost never seem to get a reply from Stefan, while I've seen others including yourself post and get an instant response. Is this an issue with using the Forum to post or am I doing something else wrong?)

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-10 03:18:59 CEST