Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

This is pretty much the exact same principle as above. Remember, when you're merging a branch, you're merging the changes you made in the branch-, from its first revision until now-, into trunk.

1. Check out fresh, unmodified copy of both your branch and trunk. Really, make sure they are fully up-to-date.
2. Make a note of the revision number at which the branch was made. It should be the first log entry when you run svn log like this:

...