[ Thread Index |
| More lists.tuxfamily.org/eigen Archives
- To: eigen@xxxxxxxxxxxxxxxxxxx
- Subject: Re: [eigen] git
- From: Gael Guennebaud <gael.guennebaud@xxxxxxxxx>
- Date: Sat, 2 May 2009 16:36:22 +0200
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=BaF5Y/x/g8xqvABnHi3DjA5+XmAE0WH0rUthux7rSHo=; b=mrNx2EcSFXa1qvKXgG7HM4yLKO+XRy6nlSzrwQOd87d6hv7BhMFmcQFQ3B60En3lXT C0ywKkZseyO613sHw6wCceKRR/0/zJ9sne/XtnWChor1Y+JzCd4eDq7U9zcEcN7tXatZ g+DIfVlNnM7godnStOhgdSqUF0w4Esjgiq+7A=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=eL1P33gDNa/L66w/PfW5ZDoHgqUH7ngXtaXVBvPas2fyZVGL4zXALb9Gk1yeOr4EdY PnsSU0WQDfiRBRwaw46d3NVRvSsnn6LglMFqGV5fnNamuJQ+DkOmEtR4g93ov26kNSzF JngYU6vHBSIUiOwnGhJNi8wqvj8m5XzHuD/fo=
On Sat, May 2, 2009 at 4:14 PM, Gael Guennebaud
> I read the hg tutorial but it only addresses very basic usage, so I
> have 2 questions:
> With the last hg repo you made (with named branches) what is the
> proper/simple way to backport a bugfix (i.e., a changeset) from the
> devel branch (called "eigen2" I think) to the stable branch (called
> "2.0") ?
ok it seems hg does not provide any cherrypicking facilities, so one
would have to do:
$ hg clone <repo>
$ cd eigen2
$ hg up -r 2.0
$ hg export 1093:9841bf4fbd63 | patch -p1
$ hg commit
where 1093:9841bf4fbd63 is the id of the changeset I want to backport.
Am I right ?
> Another question: with hg is it possible to push many local commits as
> a single one ? (in other word cluster many changesets into a single
> On Sat, May 2, 2009 at 3:45 PM, Thomas Capricelli <orzel@xxxxxxxxxxxxxxx> wrote:
>> I agree with this. I think we need a kind of 'validation' from main
>> developers. i'm not sure who they are, but at least Gael and Benoit according
>> to the activity graph. I did not mention it yet, did I ? Here's an example
>> http://imagebin.ca/view/1147WxM.html This is provided by a mercurial extension
>> i wrote, it is based on the number of commits and only means .. well, not more
>> than just that.
>> I guess the original setup would be an 'official' repository where only few
>> people could push. I propose that we setup this repository on bitbucket, and
>> the developers plays with it, pulling and pushing to learn how it works.
>> Meanwhile, the official repository would still be the kde svn of course.
>> If/once validated it would be easy to do another conversion from scratch,
>> after applying a tag in svn to know where this happened, and switch the
>> official repository.
>> I can help with that and the wiki documentation. I'm a happy eigen user, but I
>> do not modify it and as such can not provide much code back.
>> On Saturday 02 May 2009 09:01:32 Gael Guennebaud wrote:
>>> However, before we make a final decision I would like we establish a
>>> workflow with associated hg commands to be sure the hg way to work is
>>> ok for us (I know hg is not very flexible to that respect in contrast
>>> to bzr for instance). Since I don't know hg yet, I cannot start that
>>> right now, but I'll start learning it and fill a section of the
>>> Developer's corner wiki page.
>> Thomas Capricelli <orzel@xxxxxxxxxxxxxxx>