Re: merge question

On 11/6/07, Snay, Marc <Marc.Snay@turner.com> wrote:
>
>
>
>
> Having a problem with my first attempt at a merge…
>
>
>
> At repository version 1423 I branched a project from
> /root/tags/project/version into /root/branches/project. I have completed my
> changes now and they are checked in at repository version 1430 in
> /root/branches/project. My main trunk for this project is in
> /root/development/project. I am now trying to merge my changes from
> /root/branches/project into /root/development/project and am running into
> errors no matter how I format my merge command. I know from looking at the
> repository logs that no changes have been made to the
> /root/development/project files between 1423 and 1430, so there shouldn't be
> any conflicts, but all of my merge attempts either delete files that I have
> added in the branch, or conflict every file that I have changed and then
> fail to commit after I have resolved the conflicts.

checkout /root/development/project

from that WC run this command:

svn merge -r1423:1430 url://server/repos/root/branches/project

Think of merge as a fancy version of create diff/apply patch. The
arguments you need to provide to merge are how to create the right
diff, and where to apply it. In the above, I left off the latter, as
the current directory is the default.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org