On 25.07.2009 02:10, Steve Borho wrote:
> On Fri, Jul 24, 2009 at 7:07 PM, Adrian Buehlmann<adr...@cadifra.com> wrote:
>> On 24.07.2009 17:58, Steve Borho wrote:
>>> Now that 0.8.1 is out the door, it's time to concentrate on 0.9.
>>>
>>> The first large steps will be happening soon.  I am going to apply
>>> names to the two existing lines of development.  The 0.8 line of
>>> development, which is present in both the stable and crew
>>> repositories, will be given a branch name of '0.8'.  The 0.9 line of
>>> development, which is only present on the crew repository, will be
>>> given a branch name of '0.9'.
>> Another rough idea to check:
>>
>> What about introducing just the branch name "stable"?
>>
>> The default branch could take over what's currently in crew repo.
>>
>> The "stable" branch could take over what's currently in stable repo.
>>
>> This would save us from a proliferation of branch names.
> 
> That is also an option.  I think I'll mull these over for a few days.

For demonstration/experimentation purposes, I've created a throw-away demo
proposal mockup repo for the future prospective combined TortoiseHg repo
that has the branch name "stable" applied to a few of the last changes from
current stable repo (I did this using mq and committed a merge with the
default branch on top).

I've pushed the result to
http://bitbucket.org/abuehl/thg-branchexample (do not use for development!)

I added you as an admin on that repo on bb. Feel free to manipulate/push/strip
whatever you like there for experimentation. I will delete that repo as soon
as it is no longer used.

Look and feel on the command line for that repo:

> hg glog -l 16
@    changeset:   3282:e5f21c9d2190
|\   tag:         tip
| |  parent:      3269:43a71c9d707c
| |  parent:      3281:5f6a45ddb531
| |  user:        Adrian Buehlmann <adr...@cadifra.com>
| |  date:        Sat Jul 25 10:55:58 2009 +0200
| |  summary:     merge with stable
| |
| o  changeset:   3281:5f6a45ddb531
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 22:46:53 2009 -0500
| |  summary:     doc: recommend sphinx 0.6 or later
| |
| o  changeset:   3280:0e001f59d882
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 22:45:44 2009 -0500
| |  summary:     manifest: include doc sources in tar files
| |
| o  changeset:   3279:87ef43108173
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 22:45:29 2009 -0500
| |  summary:     setup: do not create config.py inside a repository
| |
| o  changeset:   3278:af996a11d1b3
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 21:38:04 2009 -0500
| |  summary:     Added tag 0.8.1 for changeset f515725f8f30
| |
| o  changeset:   3277:faed93f61c94
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 21:09:38 2009 -0500
| |  summary:     iss: bump revision number to 0.8.1
| |
| o  changeset:   3276:dcdf23efb60d
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 21:09:25 2009 -0500
| |  summary:     iss: change email contact
| |
| o  changeset:   3275:13c5128871c4
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 21:09:01 2009 -0500
| |  summary:     iss: include new documentation files
| |
| o  changeset:   3274:dca73d020216
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 20:43:33 2009 -0500
| |  summary:     doc: use more formal speech
| |
| o  changeset:   3273:16cd5f235f1a
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 20:20:37 2009 -0500
| |  summary:     doc: mention translations, clean up english
| |
| o  changeset:   3272:46204ae5cc4f
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 20:08:01 2009 -0500
| |  summary:     doc: fill in some intro details
| |
| o  changeset:   3271:ccf8903ff2f8
| |  branch:      stable
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 19:39:28 2009 -0500
| |  summary:     doc: fill in preface details
| |
| o  changeset:   3270:962b9dba4492
| |  branch:      stable
| |  parent:      3267:ab18f41b523d
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 16:02:23 2009 -0500
| |  summary:     i18n: update translations
| |
o |  changeset:   3269:43a71c9d707c
| |  user:        Simon Heimberg <sim...@besonet.ch>
| |  date:        Thu Jul 23 10:18:32 2009 +0200
| |  summary:     hgemail: remove code for mercurial < 1.3
| |
o |  changeset:   3268:888b8a88301d
|\|  parent:      3215:9e815f5a66cf
| |  parent:      3267:ab18f41b523d
| |  user:        Steve Borho <st...@borho.org>
| |  date:        Thu Jul 23 10:23:15 2009 -0500
| |  summary:     merge with stable
| |
| o  changeset:   3267:ab18f41b523d
| |  user:        Giampaolo Fadel <gp.fa...@gmail.com>
| |  date:        Thu Jul 23 14:42:41 2009 +0200
| |  summary:     doc: add faq as appendix
| |

> hg branches
default                     3282:e5f21c9d2190
stable                      3281:5f6a45ddb531 (inactive)
hg-crew-tip                 1245:d4f7109d91b5 (inactive)

> hg par
changeset:   3282:e5f21c9d2190
tag:         tip
parent:      3269:43a71c9d707c
parent:      3281:5f6a45ddb531
user:        Adrian Buehlmann <adr...@cadifra.com>
date:        Sat Jul 25 10:55:58 2009 +0200
summary:     merge with stable

> hg up stable
18 files updated, 0 files merged, 1 files removed, 0 files unresolved

> hg par
changeset:   3281:5f6a45ddb531
branch:      stable
user:        Steve Borho <st...@borho.org>
date:        Thu Jul 23 22:46:53 2009 -0500
summary:     doc: recommend sphinx 0.6 or later

> hg up default
19 files updated, 0 files merged, 0 files removed, 0 files unresolved

> hg par
changeset:   3282:e5f21c9d2190
tag:         tip
parent:      3269:43a71c9d707c
parent:      3281:5f6a45ddb531
user:        Adrian Buehlmann <adr...@cadifra.com>
date:        Sat Jul 25 10:55:58 2009 +0200
summary:     merge with stable

------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-discuss mailing list
Tortoisehg-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss

Reply via email to