merging help needed

Hello all. I'm a brand new user to SVN and are having a hard time
working out merging. Perhaps I built my project incorrectly so I'll
explain from scratch and perhaps someone can suggest a better method.

We have our project (schtml). We need to maintain a production version
for new releases and a pre-production version to test on. And every now
and then, merge what we have done in preprod into the new prod ver.

So I created /var/repos/schtml and did my initial import of the
production code into svn://localhost/schtml/prod

        cd /home/me/prod
        svn import svn://localhost/schtml/prod

I then copied (using svn copy) svn://localhost/schtml/prod to
svn://localhost/schtml/preprod to create a seperate branch.

Now, we recently did a lot of changes to preprod and those commits
incremented the revision of preprod to 8. Now we want to merge preprod@8
with prod@1

So I went into /home/me/prod and did this:

        svn merge -r 1:8 svn://localhost/svhtml/preprod
                U somefile.c
                U another.c
                U andanother.h

        svn ci -m "merged preprod@8 into prod@9"
        svn update
        (at revision 9)

However, there were several files that did not get merged. Any ideas on
why? I went back to /home/me/preprod and looked at file "thisone.c" and
it clearly had many changes in it that were not merged. In fact, if you
notice above, thisone.c isn't even mentioned in the file modification list.

All files are present in both branches. We've never added or deleted
files. So why was thisone.c skipped?

All help is appreciated.

Thanks,
Matthew

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 26 06:46:53 2006