Merging of moved paths

[Chris <sv...@chrissearle.org>]

Need a little help sorting out a merge problem

The head of app/trunk was branched to app/branches/hibernate in
release 9.

app/branches/hibernate was svn mv'd to app/branches/new in release 15
('cos it wasn't just converting to hibernate).

Head version is now 55 - and app/branches/new needs merging back to
app/trunk.

Sitting in app/

svn merge --dry-run -r 9:head branches/new trunk

gives

svn: Invalid editor anchoring; at least one of the input paths is not
a directory and there was no source entry

Probably because app/branches/new didn't exist in r9

But

svn merge --dry-run -r 15:head branches/new trunk

Shows all the new files from r9 to r14 as:

Skipped missing target: 'trunk/path/to/new/file'

So - these changes disappear.

Not sure how to merge these back to trunk anymore - hints anyone?

-- 
Chris

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