[Svnmerge] svnmerge not merging files that were added to trunk

[Roberto Mello]

On Nov 30, 2007 1:11 PM, Blair Zajac <blair at orcaware.com> wrote:
> Roberto Mello wrote:
>
> Did you do a merge into the branch, do a revert, then do another merge?  The
> revert will leave files in the wc, but the second merge will ignore files
> already sitting there, so you can end up with missing files in the second merge.

Yes, I did do that, now that I think about it. Darn it.

>
> You should use the version in trunk, it's the best version.

Okay.

> > 3) Suggestions for how to fix it? If I manually merge the files so
> > they appear in the branch, what should I do with svnmerge so it keeps
> > track of those files from then on?
>
> svnmerge.py should check for skipped files or at least for a perfectly clean
> working copy before merging.

It went along and happily merged. I'm wondering now how to fix the
problem so the files are committed into the branch, since they
currently are not.

-Roberto