On Apr 23, 2005, at 3:38 PM, Faheem Mitha wrote:
>
> 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.
Thos 'skipped' messages mean that your belief about when the file came
into existence... is incorrect. If the files really had first appeared
on the branch between r507 and HEAD, then your merge command:
> faheem ~/wc/corrmodel/c++-strategy>svn merge -r507:HEAD ../c++ .
> U score_fn_pif.cc
> Skipped 'gendata_fn_pif.hh'
...definitely wouldn't have printed 'skipped', it would have printed
A gendata_fn_pif.hh
instead. The 'skipped' message almost always means that the file
exists in *both* r507 and HEAD, and merely changed between those two
revisions. And because the file doesn't exist in the working copy, the
merge command has nothing to edit.
I'm almost certain that r507 of the two branches are *not* identical.
I think you need to re-run 'svn log -v' on each branch, and look very
carefully at the changes. Better yet, run 'svn log -v' on
gendata_fn_pif.hh, and see exactly when it came into existence.
In short: your merge command isn't comparing the correct two snapshots
of the c++ branch. You probably need to start with a revision older
than r507. Typically you'd find the revision in which the c++ branch
first came into existence, and use that as the left-hand side of the
merge. (Try 'svn log --stop-on-copy URL-to-c++-branch' to find that
revision.)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Apr 24 06:04:22 2005