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

[TSVN] TortoiseSVN - Merge "From" Revision Selection Bug

From: Huston, Robert _at_ AS <_at_>
Date: 2005-07-25 00:10:44 CEST


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").

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.

I am using what was available in the "TortoiseSVN-"

Thank you for a great product. If I can be of any assistance, please let me

- Rob Huston

Robert S. Huston
Principal Engineer
L-3 Communications Avionics Systems
1105 Schrock Road, Suite 800
Columbus, OH 43229
Ph: (614) 825-2215
Fx: (614) 825-2037
www.l-3com.com/as <www.l-3com.com/as>
Received on Mon Jul 25 09:00:57 2005

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

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