Hello,
to be certain that the problem is not related to my 1.8.13 server, I have created a new file://-repository with TSVN 1.9.3. I committed 10 revisions in trunk, made a branch from revision 5 and checked out a working copy of that branch. Still, in the merge dialog the "Show log" button for the source URL stops showing Logs at the revision the branch was created in instead of the revision the branch was created from. When unchecking "stop on copy/rename" the trunk revisions that have not yet been merged to the branch are still rendered in gray as if they have been merged. Again, the command line client gives the correct results.
Kind regards
> > > when my repository was at revision 40000, I created a branch from trunk revision 39800 and checked out a working copy of this branch.
> > >
> > > When trying to merge some trunk revisions into that working copy, the "Show log" button for the source URL initially doesn't show any logs ("For complete history deselect 'Stop on copy/rename'"). Expected behaviour: Show trunk logs from revision 39801 to HEAD.
> > >
> > > When deselecting 'Stop on copy/rename' all trunk logs are shown but they are all greyed out as if they were already merged. Expected behaviour: Show unmerged revisions in black and merged revisions grayed out.
> > >
> > > Since the command line client gives the expected results for "svn mergeinfo --show-revs eligible [trunk-URL] ." I think this is actually a TSVN problem.
> > >
> > > TSVN 1.9.4 Build 27285 64 Bit on Win 8.1 Pro, LogFindCopyFrom set to "true"
> > > Server is svnserve 1.8.13 1667537 (Linux)
> > >
> > > Kind regards
> > >
> > Are you 100% certain you are specifying the correct URLs in the merge
> > Are you 100% sure that when you created the branch from trunk you
>
> Yes for both. And the command line client gives the expected results.
>
> > Any chance you could provide some screenshots depicting the set up you
> > have and directly demonstrating TSVN's behavior?
>
> Please see the attached pictures. The actual revisions are:
> HEAD: 37582
> Branch created in revision 37578 from trunk revision 36666.
> Expected behaviour:
> - Do not stop at revision 37578 but at revision 36666
> - Show trunk revisions 36667 to HEAD in black instead of grayed out
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3182646
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-08-17 11:22:19 CEST