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

Re: KUDOS to the svn team re: voting experience

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-08-14 18:21:48 CEST

"Hamilton Link" <helink@sandia.gov> writes:

> Better than either automerging or providing one conflict file, "svn
> up" gave me several files to compare, and diffing the .mine and the
> .r66 versions let me see what I had voted for and (in this case) add
> the same votes into .r70.

Alternately, you could have simply looked at the conflict markers
placed within the file, and resolved those. But I'm glad you found
the 3 fulltexts useful too.

> The need to "resolve" the conflicted file once I had written my
> modified .r70 back out as VOTES is also nice as a simple but
> important piece of bureaucracy, as I have more than once committed
> merge conflict files into cvs repositories and I can't see doing
> that with svn.

Yup, that's exactly the reason we require 'svn resolve'. :-)

> I hope my experience with managing branch dependancies is as nice.

Sure, when you run 'svn merge', the exact same diff3 process runs.
There's almost no difference between 'svn up' and 'svn merge', except
that the merge modifies just your working files, while update modifies
the text-bases and entries-files as well.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 14 18:23:24 2002

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.