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

tortoise mergeinfo & eligible revisions

From: Andrea <mariofutire_at_googlemail.com>
Date: Tue, 07 Jul 2009 20:18:23 +0100

Hi,

I've been using the merge dialog of tortoise and I've noticed the log of the source shows more
eligible revisions that the equivalent command line.

Let's say

1) we are at rev 1000: svn copy trunk branch/123 (this happens at rev 1001)
2) a few more commits into trunk
3) now we are at rev 1010 and I want to merge some of the commits at point 2 from trunk to branch/123
4) when I select Merge (top choice), and enter trunk as source path, and ask for the log, tortoise
displays the list of changes happened to trunk and they are all available (1-1010).
5) what I expect is to be able to merge changes 1002-1010. Everything happened before is already
part of the history of branch/123
6) if I run "svn mergeinfo --show-revs eligible trunk" from the branch/123 folder, I get 1002 to
1010 (which makes sense to me).
7) if I merge (e.g.) 1005, then next time at point 4, tortoise displays rev 1005 greyed out
correctly, but still it lets me select 1-1001 which is misleading.

If try to merge one of those revisions (1-1001) nothing seems to happen, but the user is puzzled
about it.

Have I done anything wrong?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-07 21:25:41 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.