From: "Monty Zukowski" <mzukowski@bco.com>
>I have some basic questions about recording merges:
>Why is the trunk special? That is, why prevent merges to the trunk but not to
>branches?
Back at TeamOne, we had a concept of a "baseline" and a "Work Area." They were in fact implemented identically, and in the last version of TeamNet, we ceased to make a distinction. "Baseline" simply became "that work area from which most developers started their own work areas".
Moving code from any work area to any other work area was a merge (or possibly just an update, if there were no conflicts.) A "rollback" was implemented as a "merge from self", where code from an earlier version of the given work area was moved forward into the current open checkpoint.
-jcr