From: Petr Baudis Date: Wed, 18 May 2005 21:42:16 GMT Subject: Re: README rewrite Message-ID: <20050518214216.GF10358@pasky.ji.cz> In-Reply-To: <20050516151604.GF7391@tumblerings.org> Dear diary, on Mon, May 16, 2005 at 05:16:04PM CEST, I got a letter where Zack Brown told me that... > So a branch is just a name for a cloned tree somewhere, the same as a tag is > just a name for a revision some time in the past? Very much so. > On Sun, May 15, 2005 at 07:28:03PM +0200, Petr Baudis wrote: > > So the local branch is the "master" branch, the rest are "remote" > > branches. Note that there is a theoretical support for multiple local > > branches, but I decided not to make things even more confusing and there > > is no Cogito interface for managing them now. > > Is there anything about the repository that 'knows' which is the master branch, > or is this just a matter of which person is in charge? So, if I have a project, > and I have a Cogito repository, so far it's just me, and just one branch. > > Then another person joins the project, and they clone my repository onto their > local system, and give it their own branch name. > > Now here is the question: > > We decide that the other person is a better project leader, and we decide to use > their branch as the master branch, and mine as just a remote branch. > > Would that be normal Cogito behavior? i.e. there is nothing to distinguish a > 'master' branch from any other except that it is the one everyone says is the > master branch? That's right. The "master" branch is just your local thing, as well as naming of the remote branches. The "master" branch name means this is the branch representing your working tree, not that it is the mainline of the project or anything. If you fork Linus' tree, in your repository your fork will be the "master" branch, and Linus' branch will be called however you name it. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor