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

Merge conflicts

From: Ian Brockbank <Ian.Brockbank_at_wolfsonmicro.com>
Date: 2004-07-28 17:22:37 CEST

Hi All,

Things are looking really great now. I'm running with Eclipse 3.0
quite happily. Thanks for all your efforts.

I've just been doing some merging from a separate branch, and I've hit a
couple of glitches. Are these known issues? They are as follows:

1: If I select multiple files (from the same repository, but different
directories in the project), Compare with Latest and Compare with Base
do nothing. No error, no window, nothing. Compare works fine if I do
each individually.

2: Conflict files are not marked as dirty (although they are marked as
conflicting).

Cheers,

Ian Brockbank
Senior Applications Software Engineer
e: ian.brockbank@wolfsonmicro.com / apps@wolfsonmicro.com
scd: ian@scottishdance.net
t: +44 131 272 7145
f: +44 131 272 7001
  
Received on Thu Jul 29 01:22:37 2004

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