Matthew Herrmann wrote: > Hi All, > > If I create a new file on a branch of a branch, it creates a 3-digit > branch (ie 1.1.2), and not 5 digit ones like all the other files which > were already on the first branch and were then subsequently modified. > > I think this is because the simple handling of newly created files just > adds a deleted revision 1.1 and then resurrects it on the branch. > > My question is, when I then merge back onto my first-level branch, it will > try to resurrect the 1.1 file from the trunk, won't it? But that revision > number will already have been taken by the branch of the branch. So either > it will have to give it an unrelated number, which breaks the idea that > 1.1.2.4.5.6 is always a descendent of 1.1.2.4, or it will clash on the > revision number of the existing branch and crash.
The new revision on the first level branch will be 1.1.4.1 Max. _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs