[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Adding files on branch off a branch

From: Max Bowsher
Subject: Re: Adding files on branch off a branch
Date: Thu, 7 Aug 2003 15:12:08 +0100

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
> is always a descendent of, or it will clash on the
> revision number of the existing branch and crash.

The new revision on the first level branch will be


reply via email to

[Prev in Thread] Current Thread [Next in Thread]