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

Re: Up-to-date-check on commit.

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-06-23 01:13:31 CEST

Josef Wolf <jw@raven.inka.de> writes:

> Please tell me why do you want commits to abort when _your_ type of
> communication failure happen (resulting in a commit of a non-UTD
> file). OTOH you want not even a warning if my type of communication
> failure (resulting in a non-UTD file which is not modified) happen.

Q. Why does Subversion not insist my working copy is up to date before
   a commit?

A. It's not generally necessary. There are lots of things you can keep
   under revision control that have no requirement for a "global
   up-to-date" state. If my repository contains the C.V. for each of
   my employees, or pictures of my children, there is no need to have
   all of them up to date to in my working copy when I commit a change
   to one of them.

Q. Why does Subversion insist files I commit are up to date? Why
   doesn't it automatically merge?

A. It's not generally possible to merge automatically. Binary files
   cannot usually be merged without special tools. Source code can
   sometimes be automatically merged, but not if the changes conflict.
   Some 'text-like' files cannot be merged at all, suppose the first
   line is the MD5 sum of the remaining lines, an automatic merge is
   likely to produce a 'corrupt' file.

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jun 23 01:15:34 2002

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