[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[news.eclipse.technology.epf] Re: EPF and Subversion/Subclipse 
Mark Phippard wrote:

Obviously no one likes to get merge conflicts, but why is that such a
big deal?  Are you dealing exclusively with unmergable binary files or
something?  Requiring locks on all files is not a solution that anyone
that uses Subversion would recommend -- ever.  Only exception being
binary files.

In general I would agree, but have you looked at the XMI files that the EPFC produces?
The EPFC developers also recommend avoiding merging. See following thread: http://www.eclipse.org/newsportal/article.php?id=239&group=eclipse.technology.epf#239

We have geographically dispersed authors that need to work with the same content, so preventing merge conflicts by using locks is far simpler than resolving conflicts by merging XMI files.

I have never heard of this happening.  You are saying the lock dialog
is coming up 20 times for one file?  Do you have a reproducible
scenario?  If so report it to users@xxxxxxxxxxxxxxxxxxxxx  In general,
it is Eclipse that calls the method that causes that dialog to come up.
I cannot imagine why it would happen so often though.

I haven't fully investigated this, but as I said, it could be a deficiency in our hook script. If we can't resolve it in the hook script then I'll post ther scenario to the Subclipse forum.

Commit will show unversioned files in the dialog and add them as part
of the commit.


Thanks. Didn't realise that.

Scott.