Upcoming release of 1.4.1

Jacob Wisor gitne at gmx.de
Thu Sep 12 14:57:42 PDT 2013


Hi!

Andrew Hughes wrote:
> ----- Original Message -----
>> Hi Jakob,
>>
>> On 09/12/2013 11:10 AM, Jakob Wisor wrote:
>>> I have realized that IcedTea-Web's Mercurial repo does not carry any
>>> branches, instead some revisions are tagged with versions.
>> Mercurial supports 'branches' in 3 different ways: bookmarks (analogous
>> to git branches), branches and repositories. There's a fantastic
>> write-up of the details of each available at:
>> http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/
> 
> I don't think bookmarks existed when we started.  We tried Mercurial's "branches"
> but they caused problems then and, having looked at them recently again, they
> are just as bad now.  So we just use separate repos for simplicity.

So, am I assuming correctly that merging branches (or actually repos) in this 
model is done by cloning multiple repos into one local repo (directory), hence 
those branches are merged automatically or resolved manually during the cloning 
process?

Regards,
Jacob



More information about the distro-pkg-dev mailing list