RE: [Subclipse-users] 1.1.4: Merge conflict during commit in freshly shared project

"LIRA Olavo" <Olavo.LIRA@gemalto.com> wrote on 07/28/2006 11:39:14 AM:

> Sorry for the misunderstanding then, I should have been clearer.
> I'm evaluating the current process of my company and modifying them, so
> now we are using PVCS and I'm pushing to SVN but this is for sure one
> question that may come up and I wouldn't know what to answer.
> Could you try to explain me or point me a document or a web page
> where I can find a reason for this? I have the pdf of the Subversion
> book but I couldn't find anything in there...

The feature is called "mixed-revision working copies".

This FAQ would probably be the best place to start. It contains links to
other areas of info, such as the book.

http://subversion.tigris.org/faq.html#wc-out-of-date

The explanation I had posted previously I think makes it fairly clear as
well:

http://subclipse.tigris.org/servlets/ReadMsg?list=users&msgNo=7465

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Jul 28 17:45:56 2006