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

Re: Subversion for CVS Users doc

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2001-10-17 22:23:54 CEST

"Derek R. Price" <dprice@collab.net> writes:

> 1.6 Conflicts:
> .rej file contains rejected local changes or rejected server updates?

The patch is being applied to your locally-modified working copy, so
any "failed hunks" will be changes that the server is trying to merge
in. I'll clarify this.

> svn revert removes .rej - is local copy now up to date?

It's not necessarily up-to-date; somebody might always have committed,
so only 'svn up' can guarantee that. :-) But all the local mods are
gone. Your local copy is exactly equal to the revision you last
updated to.

> 1.7 Binary Files:
> are binaries stored as xdiffs or the like on the server end when this
> makes the file size smaller?

The server treats *all* files as pure binary data. Storage is diffy,
but it's a binary diffing algorithm. Not sure what you're asking?

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:45 2006

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.