On Fri, 2008-07-18 at 11:30 +0100, Julian Foad wrote:
> Using svn 1.5.0 to merge branches/1.5.x-issue3067 into a clean WC of
> branches/1.5.x, I am seeing strange notifications.
Using svn built from the "1.5.x-issue3067" branch to perform this same
merge, it all goes smoothly:
> julianfoad_at_edith ~/src/subversion-1.5.x
> $ ~/src/subversion-1.5.x-issue3067/bin/svn merge http://svn.collab.net/repos/svn/branches/1.5.x-issue3067
> --- Merging r32110 through r32172 into 'COMMITTERS':
> G COMMITTERS
> --- Merging r32110 through r32172 into '.':
> U subversion/libsvn_client/merge.c
> --- Merging r32110 through r32172 into 'subversion/bindings/swig':
> G subversion/bindings/swig
> --- Merging r32110 through r32172 into '.':
> U subversion/tests/cmdline/merge_tests.py
> --- Merging r32110 through r32172 into 'CHANGES':
> G CHANGES
> --- Merging r32110 through r32172 into '.':
> G .
I'll conclude that the issue #3067 fix is doing a good job!
And, likewise, using this build allowed me to merge from trunk to
branches/tree-conflicts without encountering the "Working copy path
'xxx' does not exist in repository" error that I was otherwise getting.
That is the merge that I really wanted, and the reason I'm testing this
fix.
I'll add my "+0" vote to the 1.5.x STATUS file for this fix. I'd like to
be stronger than "+0" but I can't review it.
- Julian
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-07-18 14:25:22 CEST