[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: FW: Subversion

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-06-20 17:00:29 CEST

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:


> - 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

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.