jakesylvestre / pychess

Automatically exported from code.google.com/p/pychess
GNU General Public License v3.0
1 stars 7 forks source link

two heads in source code #656

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago
Hi,
I have updated code from repository and now I have two heads. I have executed 
heads command to see what is going on:

$ hg heads | head -n 15

changeset:   1763:9daa63d2efc4
branch:      openings-endgames
tag:         tip
user:        Justin Blanchard <UncombedCoconut@gmail.com>
date:        Wed Mar 16 23:57:48 2011 -0700
files:       lib/pychess/Players/CECPEngine.py lib/pychess/Players/Engine.py 
lib/pychess/Players/UCIEngine.py lib/pychess/Utils/GameModel.py 
lib/pychess/Utils/logic.py lib/pychess/widgets/gamenanny.py 
utilities/blunders.py
description:
Initial engine MultiPV support (no GUI yet)

changeset:   1760:9e3d8e24f688
parent:      1758:4719fce6a9e7
user:        gbtami
date:        Thu Mar 17 10:34:04 2011 +0100
files:       lib/pychess/__init__.py

------
There are two heads and it looks like also two branches "default" (gbtami last 
commit) and openings-endgames branch (Justin Blanchard last commit).

Why are there two branches? As I have looked at the history I see there was 
always one branch. Any additional commits where doen in separate repositories 
and then merged with "default" branch.

Original issue reported on code.google.com by igo...@gmail.com on 17 Mar 2011 at 1:09

GoogleCodeExporter commented 9 years ago
Well, in svn branch development was done in branches.
I don't know if there is historical precede on mercurial, but we should of 
course try to figure out what is most beneficial.

Original comment by lobais on 17 Mar 2011 at 1:15

GoogleCodeExporter commented 9 years ago
lobais, Mercurial branching vs. cloning:
* Named branches are for developing different branches or versions of the same 
application,
* Clones are for managing different contributions to the same version of the 
application.

Original comment by igo...@gmail.com on 17 Mar 2011 at 1:38

GoogleCodeExporter commented 9 years ago
We have several branches in hg. There are old ones, like f.e. database 
transformed from svn, and a new one created by Justin.
Sometimes we have to merge in default branch when someone pushes a changeset 
without updating hes local clone while another committer pushed another 
changeset.

Original comment by gbtami on 17 Mar 2011 at 5:20

GoogleCodeExporter commented 9 years ago

Original comment by gbtami on 17 Mar 2011 at 5:24