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

TortoiseMerge 1.2.5 Build 4719 - Merge "From" Revision Selection Bug

From: Huston, Robert _at_ AS <_at_>
Date: 2005-10-24 00:09:00 CEST


I am using TortoiseSVN/TortoiseMerge 1.2.5. I have been very happy with the
product since I started using it in Feb 2005, but I have encountered an
annoying issue when working 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 always have to fix it
manually. I did a search on your Issue Tracker but nothing jumped out (I
searched for things related to "merge"). (This has been a problem since the
TortoiseSVN 1.2.1 release, and I submitted an issue to the "dev" list at
that time, but I have a feeling it didn't go through.)

As an example of the problem, assume that a "my_branch" directory has been
created and has the following history:

8 Removed tother
7 Added that
6 Fixed this
5 Created "my_branch" branch from rev 4 of trunk

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" directory 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 the TortoiseSVN
1.1.x release line, I was always able to select the "from" and "to"
revisions from the "Show Log" window and this was very convenient. Is there
a way to get this behavior back?

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

Thank you.

- Rob Huston

Robert S. Huston
Senior Staff 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 Oct 24 08:17:10 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.