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

command line to show eligible revisions to be merged is different from tortoisesvn client

From: Marcia Almeida Rocha <Marcia.Rocha_at_wedotechnologies.com>
Date: Fri, 7 Nov 2014 11:50:46 +0000

I have following situation:

I have trunk
I have branches/3.1 created based on trunk (this branch will receive merge from trunk when trunk changes are stable )

Later, I did commits under trunk with revision 610.
I did not merge this revision to branches/3.1 yet.

Later, a new version will start and 3.1 version should be under Maintenance. So I've created a branch 3.1-work based on trunk and a new stable branch 3.2 based on previous branch 3.1. And trunk is used for development of 3.2 version.

So , that revision 610 is not merged yet to stable branch 3.1 , but it should be merged in the future.

If I use command line or TortoiseSVN to show which revisions are elegible to be merged to branches 3.1, both shows me the revision 610.

But, when I did merge of revision 610 from branches/3.1-work to branches/3.1 and commit it, following situation happens:

If I want to verify which revisions are pending to be merged from 3.1-work 3.1 using command line, I have no revision, correctly, because I've already merged revision 610.
for i in `svn mergeinfo --show-revs eligible http://svn:82/repos/AF/branches/3.1-work
http://svn:82/repos/AF/branches/3.1`; do svn log http://svn:82/repos/AF/branches/3.1-work -"$i";done;

BUT, if I use TortoiseSVN Merge option and put URL Merge from: http://svn.wedo.pt:82/repos/AF/branches/3.1-work
And click show log
uncheck Stop on copy/rename
Click Show All
Check Hide non-mergeable revisions

Results: TortoiseSVN shows me the revision 610, but I would like to show any revision like command line.

Do you have this problem?
Best Regards
Marcia Rocha


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-11-07 13:10:43 CET

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