Blair,
I have two repositories with development going on in each. One is a stable
branch where we periodically make small changes and the other is our beta
branch where we do larger development projects. When we make a small change
to our stable branch, we want those changes to our beta branch as well. So,
for example, if I have a file in beta with a lot of changes named
allergies.cfm and someone else has made small changes for a quick bug fix in
the stable branch to allergies.cfm, they need to get merged. I find that
when I go to my working dev sandbox and do the command below, it gives me
the latest stuff in my working copy from prod but removes all my dev changes
in my local copy that are commited to dev but not yet to prod. I need to
keep all the dev stuff and add the new changes from prod.
svn merge http://10.1.1.15/svn/eDig/dev/include/allergies.cfm
http://10.0.1.15/svn/eDig/prod/include/allergies.cfm
If find if I switch the merge to do prod then dev, nothing happens at all.
Thanks!
On 8/15/06, Blair Zajac <blair@orcaware.com> wrote:
>
> 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/
>
Received on Tue Aug 15 21:20:23 2006