problem with simple use of 'svn merge'

Hi,

I was trying to merge changes from one branch to another branch of a
project. One branch is corrmodel/c++. The other is
corrmodel/c++-strategy. At rev 507, c++ and c++-strategy were
identical. Since then I have made changes in the c++ branch, but
c++-strategy has not changed. So I tried merging the changes from 507
to HEAD from c++ to c++-strategy.

The changes applied cleanly. However, there are two files in the c++
branch that were added since rev 507. These are gendata_fn_pif.hh and
score_fn_pif.hh. I expected these to be added to c++-strategy, but to
my surprise, they were not.

I looked at the section on merging in the svn book, but could not find
an explanation.

Am I missing something here? I'd appreciate any enlightenment. Please
cc me at the above address, I'm not subscribed.

                                                              Faheem.

faheem ~/wc/corrmodel/c++-strategy>svn merge -r507:HEAD ../c++ .
U score_fn_pif.cc
Skipped 'gendata_fn_pif.hh'
U score_fn.cc
U gendata_fn.hh
U search_fn.hh
U setup.py
U conv.cc
Skipped 'score_fn_pif.hh'
U score_fn.hh
U aux_fn_pif.cc
U conv.hh
U aux_fn.cc
U simann_ex.cc
U main.cc
U gendata_fn_pif.cc
U gendata_fn.cc
U search_fn_pif.cc
U search_fn.cc
U Makefile
U aux_fn.hh

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 23 22:45:56 2005