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

Re: [TSVN] TortoiseSVN Issue: Merge dialog decrements selected From revision

From: Tobin Bergen-Hill <tbhill_at_d-a-s.com>
Date: 2005-09-09 17:46:27 CEST

Stefan:

Thanks for the prompt reply - my comments are below.

Stefan Küng wrote:

> Tobin Bergen-Hill wrote:
>
>> When merging changes on a branch to a main development branch (or
>> trunk), if the user uses the Show Log button near the From revision
>> field to select the revision when the branch was created, the Merge
>> dialog subtracts one from the result returned from the Log dialog.
>> If the user does not correct this, the merge fails because the
>> starting revision does not exist on that branch.
>>
>> Please fix this so that the From revision field uses the specified
>> branch in the Log dialog.
>
>
> That's a feature, not a bug. If you select a revision to merge (or a
> range of revisions), then you *must* subtract one from the revision
> you want to merge.
> Example:
> you want to merge revision 102 back into the trunk. So you must merge
> from revision 101 to revision 102.
>

This issue is specifically for merging in branches, not files. Using
the example in the TortoiseSVN documentation:

Rev Comments
39. Working on MyBranch
38. Working on trunk
37. Working on MyBranch
36. Create branch MyBranch
35. Working on trunk
34. Working on trunk
...

Given that I want to merge MyBranch to the trunk. So, as the
documentation indicates, I highlight revisions 36 through 39 in the Log
dialog. When it returns to the Merge dialog, the From field displays
35. If I do not correct this to 36 and follow through with the merge,
TortoiseSVN will report "Error: file not found" because revision 35 has
no information about MyBranch.

Since it is possible for the Log dialog to identify revisions for a
created branch (i.e. it highlights the revision blue), it should be
possible for the Merge tool to determine that the selected From revision
is a branch creation revision and should NOT decrement the chosen
revision. Right?

> Also, update to version 1.2.2 please.
>

Has this issue been fixed in 1.2.2?

-- 
Tobin Bergen-Hill
Dynamic Animation Systems
tbhill@d-a-s.com
phone: (703) 503-0500x238
fax: (703) 425-2204
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 9 18:33:18 2005

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