We just upgraded a fairly substantial repository to svn 1.5.3, which has a
lot of branches, so we were pretty excited about using the new
merge-tracking in 1.5.x. Our branching model is that we create branches for
releases as soon as we start working on them, and periodically merge changes
from the branches in a cascade to the trunk; for example, we might have the
following:
/------------------------------------> 1.0
/ /-------------------------------------> 1.1
/ / /-------------------------------------> 1.1.1
/ / / /------------------------------------> 1.2
/ / / /
---------------------------------------------------------------> trunk
and we'd merge 1.0 => 1.1 => 1.1.1 => 1.2 => trunk.
Maybe I'm misunderstanding the new svn merge syntax, but I was under the
impression that I could, for example, do something like:
cd my-1.1-working-copy
svn merge svn://our.svn.repository/branches/1.0
and, assuming we had merge-tracking somehow primed*, it would do the merge;
but in fact whenever I do that, I get an error: "svn: Target path does not
exist".
A more concrete example, slightly anonymized from the real paths:
$ cd 1.1 # my clean 1.1 working copy
$ svn mergeinfo --show-revs eligible \
svn://svn.us.com/branches/1.0
r28140
r28141
$ svn merge svn://svn.us.com/branches/1.0
svn: Target path does not exist
If I do
$ svn merge -c 28141 svn://svn.us.com/branches/1.0
it works fine.
The server was upgraded from 1.4 and I actually did a dump/load because I
wanted to reshard the respository. I should add that it's possible that
there are some rather ... hairy ... renames in the branches at the moment
and if that's the issue, I guess we'll just have to live with it, but I
can't find any clear information on what causes this "Target path does not
exist" error. Any insight would be appreciated.
Thanks,
Kate Ebneter
Build Engineer
Ning, Inc.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-15 11:19:15 CEST