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

Merge problems

From: Michele Campeotto <micampe_at_gmail.com>
Date: 2005-11-17 17:23:35 CET

  I think I have some problems with the merge window.

  I'm merging a range of revisions, say r1496:1512, while HEAD is at
1515: I select the branch and the starting revision by selecting r1496
it on the log dialog.
  At this point the starting revision text field shows 1495 and the
ending revision text field is automatically set to 1496. This can be a
sometimes correct assumption, even if I'd prefer it to be left empty.
The 'Use "From" url' check box is selected.
  I now select the ending revision, again by using the log dialog and
clicking on r1512 and the problem is here: the starting revision text
field is set to 1511.

  The only way I can select a range longer than one revision, is to
uncheck the 'Use "From" url' check box before selecting the ending

  As an aside, if 'Fetch affected paths on demand' is selected in the
preferences (which seems to be the default), I get an unspecified
internal error when I click on different revisions on the log dialog,
with the attached exception in the log. Unchecking the option fixes
the problem (honestly, I don't even understand its meaning).

  Eclipse 3.1.1, Subclipse 0.9.37, Subversion server 1.1, http protocol.


Michele Campeotto - www.micampe.it
It's psychosomatic. You need a lobotomy. I'll get a saw.
	-- Calvin
Received on Fri Nov 18 03:23:35 2005

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

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