info-cvs
[Top][All Lists]
Advanced

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

Re: Having trouble with branching on a repository that already has a


From: Larry Jones
Subject: Re: Having trouble with branching on a repository that already has a
Date: Sat, 1 Oct 2005 01:56:17 -0400 (EDT)

Jeff Bowes writes:
> 
> I am importing an open source project (GMOD) as a vendor branch.  I 
> change several files and check it in. Later I check out the  project and 
> create a branch.  This seems to work fine.  What I don't understand is 
> that with the files I changed the new branch starts off the trunk 
> (branch: 1.2.2) while with the unchanged files the new branch seems to 
> be starting from the vendor branch (branch 1.1.1.1.2).

That's exactly right.  As long as an imported file hasn't been locally
modified, the default branch is the vendor branch rather than the trunk.
That avoids having to duplicate all the vendor changes on the trunk.  As
soon as you commit a change, the revised version goes on the trunk and
the default branch is automatically switched.

-Larry Jones

All this was funny until she did the same thing to me. -- Calvin




reply via email to

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