> Here is my thought:
>
> Currently the v0.9.4 branch is r1087, the trunk is r1085.
>
> 1: Manually copy over all the changes from the current v0.9.4
> branch
> to the trunk and check in the truck, making revision 1088.
>
> 2: Next time I do a merge from the branch to the trunk, I use the
> --re
I have foobared the branch and cannot merge it anymore. The main
trunk is the next release; the branch (v0.9.4) is the current code in
which I am fixing bugs and releasing point releases, like v0.9.4.1,
v0.9.4.2, etc. I believe where I made mistake here:
When I release code, I tag the v0.9.4 bran
