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

mark as merged

From: Wojciech Biela <wbiela_at_exorigo.pl>
Date: 2005-08-18 11:25:31 CEST


I don't know if it's a bug or just my misuse of Subclipse

I'm using Subclipse 0.9.32 on Eclipse 3.1, Windows2k

When Subclipse notices a conflict (red marker) I open the compare view,
I manually copy the changes from the remote file to the local copy, I
save the local file, then I choose "mark as merged" on the local file
(the red marker is still on) so the marker goes away. Now the problem is
there is no way to commit the merged changes now, there is no marker
now, the "synchronize.." command tells me the files are identical,
though I manually perfectly see that they are not. So what I have to do
is open the file, put a space or change it in any other way, save .. and
now Subclipse sees all the changes (the space I just have put, and the
merged changes). Problem arises when I have a lot of files to merge and
I have to remember which files to "touch" after marking them as merged
.. as I see it after "mark as merged" I should see the merged file in
the commit view for a clean commit.

Please correct me if I'm wrong in understanding of the commands, but if
it's a bug then please take it into consideration for the next release

Best regards

Wojciech Biela
Exorigo Sp. z o.o.
ul. Sienkiewicza 49/115
15-002 BiaƂystok
wbiela@exorigo.pl, www.exorigo.pl

Received on Thu Aug 18 19:25:31 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.