[ Thread Index |
Date Index
| More lists.tuxfamily.org/eigen Archives
]
- To: eigen@xxxxxxxxxxxxxxxxxxx
- Subject: Re: [eigen] hg woes
- From: Benoit Jacob <jacob.benoit.1@xxxxxxxxx>
- Date: Wed, 4 Nov 2009 13:29:28 -0500
- 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=45wbC6xfleD/3hJrizMjT99/7i8pZERNcrqjnjibQBs=; b=W5kAYlO9UmVN9tRYRzqg/BvLl++9rI1+ASaVaJttUskHuv5+998axlG8uPGbSDSIBb zpBWB5tvfdoBaP/aPAV3CCZfbTjq63HLj5dbDxel09Wu97iY6MZmE8C1o1e2mSVXDNWJ HcGRTyok4CNksWgkSI7tmdTJTfBiikrQQAATY=
- 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=D/3kvTygECvDRA0UpG24iEt0A8e371YO0yLxjZjzvn8QKxb7Z24pU4ZPvibKTjlVKN Zq69THVf1pSzlHJUR86Uq6Wj0Q+xJ1y2a0IqQ5O/Y084oy9Tp5dTE06fOr89Wh/SyRsp 5m3K7gEvV+2enIftMbQknYkCKzsId0juuxN5k=
2009/11/4 Thomas Capricelli <orzel@xxxxxxxxxxxxxxx>:
> In data mercoledì 04 novembre 2009 15:47:01, Björn Piltz ha scritto:
> : > Hi all,
>> I've created a fork which I want to keep up to date with eigen devel.
>> I tried the following:
>> hg pull http://bitbucket.org/eigen/eigen2 -r default
>> hg merge
>> hg commit
>> hg out
>>
>> > (lot's of changes)
>>
>> hg push
>>
>> >pushing to http://bitbucket.org/bjornpiltz/autodiff
>> >searching for changes
>> >abort: push creates new remote branch '2.0'!
>>
>> Any idea how I can get passed this?
>
> How did you create your original fork ?
Just FYI, when you click "fork" on bitbucket, it seems to fork only
the branch you're currently viewing.
Benoit
>
> Checking http://bitbucket.org/bjornpiltz/autodiff, there is indeed only the
> 'default' branch there. Which is weird.
>
> The original eigen2 has two branches (default, 2.0).. and your clone has only
> one. So when you pull, you update your local copy, and this creates a new
> branch.
> The problem might be that you used some option when cloning the first time in
> order to clone only one branch... In this case, just force the remote branch
> creation ('hg push -f'). and carefully check after this (hg in, hg out)
>
> ++
> --
> Thomas Capricelli <orzel@xxxxxxxxxxxxxxx>
> http://www.freehackers.org/thomas
>
>
>