> "Stephen" == Stephen J Turnbull
<stephen(a)xemacs.org> writes:
Your requirements are hacky, in the sense that the previous revision
computed here is typically not the parent of the first revision on a
branch. ("Typically" for all users. I'm not saying this won't work
fine for you, but you should be aware of the gotcha.) This
implementation assumes that once you branch, you close the old branch
to further development:
trunk 1.1 -- 1.2 -- 1.3 -- 1.4
\
branch 1 2.1 -- 2.2
\
branch 2 3.1 -- 3.2 -- ...
Just for the protocol, I have also tried (maybe misunderstanding
something fundamental), branching along the 1.1 trunk in a different way
Trunk 1.1--1.2
\
branch 1: 1.2.1.1--1.2.1.2--1.2.1.3
However then I wanted to use the content of 1.2.1.3 to continue in the
trunk as 1.3, the this did not work. On the other hand, as you indicate
in your diagram this is possible with trunk 1, branch 2, branch 3 etc.
Uwe Brauer
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta