Guys.
In fact this is almost standard Subversion behaviour.
The command line svn prevents you from even committing files that were in
conflict but haven't been resolved first.
So, as I understand it, Subclipse should prevent us from committing until
the conflict is resolved, and then allow us to commit.
Cédric, if you want reproduce it, all you have to do is:
* checkout a project in Eclipse
* modify a file in it
* go to the command line and use some other editor (vi, notepad) and modify
the same file at the same line with different text and commit it.
* Team->Update your project under Eclipse and that should cause a conflict
for the modified file.
- Greg.
-----Original Message-----
From: news [mailto:news@sea.gmane.org] On Behalf Of Cédric Chabanois
Sent: Friday, 8 October 2004 6:35 PM
To: users@subclipse.tigris.org
Subject: Re: Commit doesn't mark as resolved
This is a bug.
How can I reproduce it ?
Cédric
<tigris@henrik.synth.no> a écrit dans le message de
news:41664A65.8030406@henrik.synth.no...
> When I commit from subclipse, it seems like eclipse
> don't register properly that the files are committed, as
> they still have a '>' or '*' in front of them.
>
> I have to do a manual "mark resolved" to remove the '>'.
>
> Is this a usual problem, and is there a way to fix it?
>
> I use Eclipse 3.0.1, with subclipse 0.9.21, with the svn+ssh protocol.
>
> best regards,
> Henrik
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Mon Oct 11 08:40:30 2004