Re: merging branches confusion

blackwater dev wrote:
> Hello all,
>
> Ok, I have svn with two branches. Different development can happen in
> each branch and periodically needs to be merged together. I have read
> the pdf book and looked up stuff online which has only confused me
> more. When merging, I find that they changes to one branch are
> deleted. I simply need a true merge where the working copies are
> blended together...is there anyway to do this? If not, it seems like
> the idea of branching/merging is pointless as I am finding when we merge
> truck b with truck a, we get the A stuff in our local copy but changes
> that were never commited to truck a, are now wiped out.
>
> Thanks!

Can you give a sample list of commands you run.

BTW, it's best to merge into a clean working copy and do the commit. I wouldn't
normally do a merge into a working copy containing uncommitted code.

Also, look at using svnmerge.py to handle the manual tracking of revisions.

http://www.orcaware.com/svn/wiki/index.php/Svnmerge.py

Regards,
Blair

-- 
Blair Zajac, Ph.D.
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org