Re: commit allowed without update first?

"Jacques Carette" <carette@mcmaster.ca> writes:
> PS: is there a feature whereby one can completely disallow unmerged
> commits? It should not be the default, but in certain settings it
> would be appropriate.

If I understand what you're asking for correctly, it is not possible.
There is no way to automatically determine whether two commits have
been "merged" or not, because the definition of "merged" is up to
humans.

Subversion does the best it can: if the changes conflict, it puts the
working file into a 'conflicted' state, and the user must run the
command 'svn resolved' to get it out of that state before committing.

Whether you actually make any changes to the file (such as removing
the conflict markers) is a matter of human judgement. There are some
contexts where the appropriate "merge" action is to edit nothing and
commit. The 'svn resolved' command exists solely for humans to have a
way to tell Subversion that the file is ready for commit.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 11 17:44:54 2004