Aw: Re: LogFindCopyFrom not working as expected
"Sven Brüggemann" <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.tortoisesvn.devel |
|---|---|
| Message-ID | <trinity-46c5209f-fe55-46ea-acca-af0a0fd0a09f-1470727233714@3capp-gmx-bs12> |
Hello,
> > 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
Kind regards
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3181709
To unsubscribe from this discussion, e-mail: [[email protected]].
1_working_copy.png
(image/png, 21.5 KB) - not displayed
2_branch_creation.png
(image/png, 47.7 KB) - not displayed
3_trying_to_merge_trunk_revisions_1.png
(image/png, 31.8 KB) - not displayed
4_trying_to_merge_trunk_revisions_2.png
(image/png, 77.1 KB) - not displayed
5_settings.png
(image/png, 8.5 KB) - not displayed
6_command_line_client.png
(image/png, 11.2 KB) - not displayed