KUDOS to the svn team re: voting experience

[Hamilton Link <he...@sandia.gov>]

I just voted on the logos, a little thing but it demonstrated definite
improvements upon cvs... none of the following is news to you, but I
just wanted to say I'm liking the new system and thank you for
developing subversion.

Once I got all my proxy issues resolved (btw, there should really be a
list in one place of *all* the http methods svn uses, unusual or no -- a
couple of partial lists is all I could find), there had been four new
revisions to VOTES. 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. 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.

I hope my experience with managing branch dependancies is as nice. When
is cvs2svn expected to properly handle branching and merging, account
for the CVSROOT/modules file, etc? (i.e. when is it expected to be
complete to the point that serious cvs repository users can use it?)

h


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: KUDOS to the svn team re: voting experience

[Ben Collins-Sussman <su...@collab.net>]

"Hamilton Link" <he...@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