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

[TSVN] Re: TortoiseSVN 1.2.1.3895 - Merge "From" Revision Selection Bug

From: Udo Schifferdecker <s_decker_at_yahoo.com>
Date: 2005-07-25 18:44:41 CEST

Rainer Müller wrote:
> Huston, Robert @ AS wrote:
>
>>Hello,
>>
>>I have been using Subversion and TortoiseSVN since February 2005 and
>>absolutely love it. At the company I currently work for, I have been
>>eagerly awaiting the v1.2.x line because of the locking features (it
>>will help with Word documents, etc.). I have just upgraded to the
>>TortoiseSVN 1.2.1 client (from 1.1.7) and have noticed an annoying issue
>>with the Merge dialog box. Once I have the "From" URL set up, and I
>>click the "Show Log" button to select my ranges, TortoiseSVN always
>>enters a revision number that is "one less" than the beginning revision
>>number in the "Revision" field. I have to fix it manually. I did a
>>search on your Issue Tracker but nothing jumped out (I searched for
>>things related to "merge").
>
>
> That is the intended behavior. You have to select the revision range which
> includes all the changes. See my comments on the example below.
>
>
>>As an example of the problem, assume that a "my_branch" has been created
>>and has the following history:
>>
>>8 Removed tother
>>7 Added that
>>6 Fixed this
>>5 Created "my_branch" branch
>>
>>In this case, rev 5 was where the branch was copied from the trunk.
>>Later, when this branch is to be merged into the trunk, the Merge dialog
>>is invoked in a WC of the trunk, the "my_branch" is selected as the
>>"From" URL, and the merge range is selected in the "Show Log" window
>>from 5 to 8, the values for the "from" and "to" revisions end up being 4
>>and 8 respectively, and not 5 and 8 as they should be. This happens
>>consistently; the "from" revision always defaults to one less than what
>>was selected from the "Show Log" window and I have to adjust it manually.
>
>
> In this case the branch was created from trunk, so this worked because there was
> nothing different in rev 5. But if you create a branch from your WC you have to
> choose rev 4 because SVN diffs the too revisions and just applies the changes.
>
> Please use the Help button or read the docs online at
> http://tortoisesvn.sourceforge.net/docs/release/TortoiseSVN_en/ch05s17.html#tsvn-DUG-merge-dia-1
>
> HTH, Rainer

Hi,

I have to disagree with Rainer here:
When selecting a range (like rev 5 to 8 in the above example) the "From:" revision should
be set exactly to that value selected in the "Show Log" dialog (rev 5 in this case).
The online help already tells the user already to select the rev BEFORE the change. If you do as told
you end up one rev lower than you wanted, which is annoying.
In the above example you even get an error message, because in rev 4 the branch is not even existing!

Or think of the follwing example:

10 Modified branch
  9 Removed something in branch
  8 Added that in branch
  7 More changes in trunk
  6 Changes in trunk
  5 Created "my_branch" branch from trunk on repos

To merge all changes made in the branch to the trunk you have to select revs 10 and 8 in the
"Show Log:" dialog ending up with "From:" = 7 and "To:" = 10 in the Merge dialog.
This is much less intuitive than selecting revs 10 and 5!

Udo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jul 25 19:04:07 2005

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