RE: Commit doesn't mark as resolved

The reason the > in front of the project won't go away is because there are
a number of new files in the package of the file that had the conflict.

When you get a conflict you get a few files created automatically.

1. Conflictclass.java.r4656 (the version you checked out against)

2. Conflictclass.java.r4657 (the version you just updated to)

3. Conflictclass.java.mine (the file with just your modifications
before the update)

1. Conflictclass.java is also modified to show both parts of conflict data
in it separated as:

>>>

Your new text

====

Conflicting incoming text that was changed between versions 4656 to 4657.

<<<<

So, if you haven't manually selected Team->Resolve then these additional
classes will still be in your file system, and hence Subclipse detects New
Unadded files, and tags the package/project as modified (>).

I hope that clarifies things for your.

As I said in a previous email just a minute ago, it's my belief that
subversion requires us to resolve any conflicts prior to commit, and
subclipse should be modified as such. I gave an example in the previous
email, but to prove my theory, invert the action order to make the first
mod+commit in eclipse, then do the update on the command line and try to
commit.

Greg.

-----Original Message-----
From: Chas Douglass [mailto:chas@floogle.net]
Sent: Saturday, 9 October 2004 2:22 AM
To: users@subclipse.tigris.org
Subject: Re: Commit doesn't mark as resolved

The problem I've had doesn't go away with refresh. "svn status -u" from

the command line shows no differences, but the ">" in front of the

project name won't go away, even with refresh.

Again, it's intermittent and not reproducible for me.

Chas Douglass

Chris Beck wrote:

> I have noticed this ... no repaint until refresh. I haven't left the

> unpainted state around long though, I just refresh and get on with

> things. For me this on 3.0.1 / 0.9.21 / https / linux

>

> It is whispered that Merg was heard, on or about 10/08/04 04:09 to say:

>

>> When you refresh the tree, are these symbols then updated.

>>

>>

>> On Fri, 08 Oct 2004 10:05:57 +0200, tigris@henrik.synth.no

>> <tigris@henrik.synth.no> wrote:

>>

>>> 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.

>

>

> --

> Chris Beck / Y.A.B.A. / Fungal Genomics / Concordia University / tel.

> ext. 5791

> "We cannot have a free government without elections; and if the rebellion

> could force us to forgo, or postpone, a national election, it might fairly

> claim to have already conquered us." -- Abraham Lincoln

>

> ---------------------------------------------------------------------

> To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org

> For additional commands, e-mail: users-help@subclipse.tigris.org

>

>

>

---------------------------------------------------------------------

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:57:43 2004