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

Merge - Hide non-mergeable revisions MISSING

From: Ellingsworth, David <David.Ellingsworth_at_davey.com>
Date: Wed, 21 Sep 2016 14:51:48 +0000

I have a repository that resembles the following structure:

/branches/A (HEAD:r340)
/branches/B (HEAD:r350, r200->/branches/A_at_r100)
/branches/Hybrid (HEAD:r351, r351->/branches/B_at_r250)

/branches/B includes all modifications from /branches/A via periodic merges
/branches/B has modifications NOT included in /branches/A
/branches/Hybrid was created from /branches/B at r250

Upon trying to merge changes from /branches/A into /branches/Hybrid, "Hide non-mergeable revisions" is sometimes absent. When it is available it correctly shows the revisions from /branches/A that can be merged into /branches/Hybrid. After mering some of the available changes from /branches/A into /branches/Hybrid and attempting to merge /branches/B into /branches/Hybrid, the "Hide non-mergeable revisions" is NEVER displayed.

I would expect the "Hide non-mergeable revisions" option to always be available and display the revisions that would be displayed by "svn mergeinfo --show-revs eligible".

Regards,

David Ellingsworth
Software Developer
The Davey Tree Expert Company

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-09-21 16:56:49 CEST

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