Linus Tolke wrote:
> I would very much like to include your additions. My problem is that I 
> can't assess the quality of ArgoUML. My Eclipse workspace seems to be 
> corrupt and Eclipse shows errors inconsistently.
> 
> Let's go for it! Commit your work immediately, I will plan a 0.28.alpha3 
> for tomorrow evening (please try to have the DTD updated by then too).

Argh! I seem to have Eclipse issues as well.  For some reason I cannot 
reintegrate my branch into my working copy of trunk, even though the branch 
is up to date.

I don't understand what the error message means, can anyone help?...

---
org.tigris.subversion.javahl.ClientException: Working copy and merge source 
not ready for reintegration
svn: Cannot reintegrate from 
'http://argouml.tigris.org/svn/argouml/branches/work_issue1048_dthompson/src/argouml-app'
 
yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.
---

Dave

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=450&dsMessageId=1022904

To unsubscribe from this discussion, e-mail: 
[[email protected]].

Reply via email to