Pending changes shows an entry Unresolved??

On Wed, 18 Jun 2008 14:07:59 +0000, kesterto wrote:

In my Pending Changes window, I have a changeset with Unresolved rather
than Incoming or Outgoing. What does Unresolved mean?

We fixed it by checking in and delivering the Unresolved changeset - but
I was curious how we managed to get this appearing.

When auto-checkin is off, all local modifications go into the unresolved
folder. They are not in a changeset yet, but waiting for you to check
them into a changeset.

Once you check them in, they will appear in the changeset and disappear
from the unresolved node.

- Dmitry

Using traditional terminology, you can think of "Unresolved" as the list
of "unreserved checkouts" and "conflicts that require merging" (the icon
on the entry in the list indicates which of these they are).

kesterto wrote:

Hi

In my Pending Changes window, I have a changeset with Unresolved
rather than Incoming or Outgoing. What does Unresolved mean?

We fixed it by checking in and delivering the Unresolved changeset -
but I was curious how we managed to get this appearing.

thanks

anthony