How to merge branch back to trunk when branch is in sync with trunk

We had a long-life branch that received a couple of merges from the trunk.

  revision 81: created branch X from trunk HEAD.
  ...
  revision 100: merged trunk into branch X - 82:99
  ...
  revision 150: merged trunk into branch X - 100:149

The branch X now contains all changes in the trunk (HEAD). I want to
apply all changes that were made to the branch X back in the trunk. But
the branch contains the trunk.

I tried merging the HEAD of branch X into the trunk working copy but the
merge does not merge anything. So I feel I am in trouble. Anyone has a
recommendation as of what to do in this situation?

Claude

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 29 17:23:00 2004