Re: FW: Subversion

Jan Mönnich <Jan.Moennich@newtron.net> writes:

> - The book do not show the capability of a svn merge tag1 tag2 for
> repeated merges like cvs.

Subversion doesn't track repeated merges yet; you have to keep track
manually, by writing good log messages and reading them later.
There's a section on this in the book:

 http://svnbook.red-bean.com/html-chunk/ch04s03.html#svn-ch4-sect-3.2

> - Is svn resolve also necessary if all conflict markers in a text file
> are removed?

Yes. Subversion doesn't 'grep' for conflict markers in the file to
know the conflict is fixed. :-) You have to tell it so.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 20 17:02:24 2003