Re: Merge branch from trunk into newer branch from trunk, resolving directory conflicts

Thu, 2 Dec 2010 01:50:09 -0500, /derek fong/:

> (...)
> [fong_at_localhost] ~/sandbox/temp/_merged/repo: svn stat
> C .
> ? dir_conflicts.prej
> ! C application
> > local delete, incoming edit upon merge
>
> I think I understand why that's happening, but what's the best
> way for me to retain the history of the files in "application"
> that are now scheduled for deletion following the merge? Do I
> need to accept "application" as deleted, then manually "svn copy"
> files and directories from b1 into their new refactored locations
> on b2? It seems there should be a better way to do this, but I'm
> stumped.

The history is preserved by the svn:mergeinfo. Just make sure you
supply -g [--use-merge-history] option to commands like log and
blame/annotate. I guess you further need:

svn merge ^/branches/b1/application <the_new_application_dir_path>

and then 'svn resolve --accept working ...' to resolve the conflict.

-- 
Stanimir