From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-perl+bounces-611-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Mh7a8-0001PH-LB for garchives@archives.gentoo.org; Fri, 28 Aug 2009 19:57:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB2EFE089C for <garchives@archives.gentoo.org>; Sat, 29 Aug 2009 01:07:02 +0000 (UTC) Received: from mail-iw0-f203.google.com (mail-iw0-f203.google.com [209.85.223.203]) by pigeon.gentoo.org (Postfix) with ESMTP id 97A67E0979 for <gentoo-perl@lists.gentoo.org>; Tue, 25 Aug 2009 18:28:16 +0000 (UTC) Received: by iwn41 with SMTP id 41so1292915iwn.32 for <gentoo-perl@lists.gentoo.org>; Tue, 25 Aug 2009 11:28:16 -0700 (PDT) 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; bh=WhEF73mpbycr6JcWiRwUCGUrZkX/bE3p5QlLM88tLlk=; b=iic9vZs1UtMPHydSbV0IqYdKrOgKb3IzipeSqUdScpher6bHRKTa6I6l5KTDHqyVqy ut2gi/eJNxxlnL6KT39I5ApLpu/o0oTCfBvvIlEQf7U7q9ugjvp9EisaOm0jztk3HNZE VQegj6MMtPx0Xxu1FJn23hc0quxIzDyYCtL74= 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; b=k57zeY/8JEmucAxtUEOArkWd7LoZHxRVFi6sfNNTN8vZzzEE8r1MntfBMTt8b6gGIO J7pRyFiaCn0Z1T+bU58Xd+aZMBIUTcr+WBWEgUzUdlwWgjFkWvcX9Jtvr2YUwkAnrtPt wHZJou/9QDTKVLpb17x5vegHyF4zLwPKJx+5I= Precedence: bulk List-Post: <mailto:gentoo-perl@lists.gentoo.org> List-Help: <mailto:gentoo-perl+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-perl+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-perl+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-perl.gentoo.org> X-BeenThere: gentoo-perl@lists.gentoo.org Reply-To: gentoo-perl@lists.gentoo.org MIME-Version: 1.0 Received: by 10.231.34.196 with SMTP id m4mr3276181ibd.5.1251224895964; Tue, 25 Aug 2009 11:28:15 -0700 (PDT) In-Reply-To: <4A93E192.5010208@univ.kiev.ua> References: <4A8EAC61.7090802@univ.kiev.ua> <4A8EB220.4080005@gmail.com> <4A8EB442.2000205@univ.kiev.ua> <8cd1ed20908210938t42c2b81bmef4c259ec569e785@mail.gmail.com> <4A93E192.5010208@univ.kiev.ua> Date: Wed, 26 Aug 2009 06:28:15 +1200 Message-ID: <8cd1ed20908251128w24e5e6c0gedb10ef6e543cf4a@mail.gmail.com> Subject: Re: [gentoo-perl] perl-5.10.1_rc2 and patches From: Kent Fredric <kentfredric@gmail.com> To: gentoo-perl@lists.gentoo.org Content-Type: multipart/alternative; boundary=0022150484477547bf0471fb7f19 X-Archives-Salt: 456dbc1a-7101-4bc0-ac8c-5afaab846ae0 X-Archives-Hash: 0ddc24136c6d41ebb9b0388e47f1cf26 --0022150484477547bf0471fb7f19 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Read all of my response before doing anything ;) On Wed, Aug 26, 2009 at 1:05 AM, Sergiy Borodych <bor@univ.kiev.ua> wrote: > portage # cd /usr/local/portage/layman/perl-experimental > perl-experimental # git checkout -b alternatives alternatives > fatal: git checkout: updating paths is incompatible with switching > branches. > Did you intend to checkout 'alternatives' which can not be resolved as > commit? I Meant 'git checkout -b alternatives origin/alternatives' , which checkouts out the remote branch 'alternatives' ( on origin ) locally. > I think you mean > > git checkout -b alternatives > git pull origin alternatives Nah, that would just give you 2 copies of master with different names. Git 'checkout -b alternatives' just checks out the current branch under the name 'alternatives', not what you want. 'git pull origin alternatives' will then *merge* the foreign branch called "alternatives" into the local branch called "alternatives" ( a derivative of master) , which is not necessarily what you want in all cases. git checkout -b NewbranchName remoteName/branchname Is how I recommend you check out branches locally. > ? > > But now layman -S give me error :( > " > From git://git.overlays.gentoo.org/proj/perl-overlay > 3ddbd1a..43666a7 master -> origin/master > You asked me to pull without telling me which branch you > want to merge with, and 'branch.alternatives.merge' in > your configuration file does not tell me either. Please > specify which branch you want to merge on the command line and > try again (e.g. 'git pull <repository> <refspec>'). > See git-pull(1) for details. > " > This is because above, you appeared to have created a new branch called 'alternatives' with no remote name. So when you run "git pull -u -v" in that checked out branch ( what layman does ), it will be going "Ok, you want to update the current branch, hold on, the hell? update from what?!. > > What am I doing wrong? > > Anyway, thanks for advice :) > > P.S. > 5.10.1 out - woohoo :) > > -- > Sergiy Borodych > http://bor.org.ua > > But you no longer need to worry about the branch, as we just merged the branch back into master :D Note, we have 5.10.1 out, *and in overlay* now :D $ cd /tmp/ $ mkdir overlay $ cd overlay $ git clone git://git.overlays.gentoo.org/proj/perl-overlay Initialized empty Git repository in /tmp/overlay/perl-overlay/.git/ remote: Counting objects: 11533, done. remote: Compressing objects: 100% (6340/6340), done. remote: Total 11533 (delta 6653), reused 8927 (delta 5110) Receiving objects: 100% (11533/11533), 2.14 MiB | 426 KiB/s, done. Resolving deltas: 100% (6653/6653), done. $ cd perl-overlay/ $ find dev-lang/perl dev-lang/perl/ dev-lang/perl/perl-5.10.1-r11.ebuild dev-lang/perl/metadata.xml dev-lang/perl/Manifest dev-lang/perl/ChangeLog $ git pull -u -v >From git://git.overlays.gentoo.org/proj/perl-overlay = [up to date] master -> origin/master Already up-to-date. -- Kent perl -e "print substr( \"edrgmaM SPA NOcomil.ic\\@tfrken\", \$_ * 3, 3 ) for ( 9,8,0,7,1,6,5,4,3,2 );" http://kent-fredric.fox.geek.nz --0022150484477547bf0471fb7f19 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Read all of my response before doing anything ;) <br><br><div class=3D"gmai= l_quote">On Wed, Aug 26, 2009 at 1:05 AM, Sergiy Borodych <span dir=3D"ltr"= ><<a href=3D"mailto:bor@univ.kiev.ua">bor@univ.kiev.ua</a>></span> wr= ote:<br> <br><blockquote class=3D"gmail_quote" style=3D"border-left: 1px solid rgb(2= 04, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div class=3D= "im"><br> </div>portage # cd /usr/local/portage/layman/perl-experimental<br> perl-experimental # git checkout -b alternatives alternatives<br> fatal: git checkout: updating paths is incompatible with switching branches= .<br> Did you intend to checkout 'alternatives' which can not be resolved= as<br> commit?</blockquote><div>=A0<br>I Meant 'git checkout -b alternatives o= rigin/alternatives' , which checkouts out the remote branch 'altern= atives' ( on origin=A0 ) locally. <br><br></div><div><br></div><blockqu= ote class=3D"gmail_quote" style=3D"border-left: 1px solid rgb(204, 204, 204= ); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> <br> I think you mean<br> <br> git checkout -b alternatives<br> git pull origin alternatives</blockquote><div><br>Nah, that would just give= you 2 copies of master with different names. Git 'checkout -b alternat= ives'=A0 just checks out the current branch under the name 'alterna= tives', not what you want.=A0 'git pull origin alternatives' wi= ll then *merge* the foreign branch called "alternatives" into the= local branch called "alternatives" ( a derivative of master) , w= hich is not necessarily what you want in all cases. <br> =A0<br>git checkout -b NewbranchName remoteName/branchname <br><br>Is how I= recommend you check out branches locally. <br><br></div><blockquote class= =3D"gmail_quote" style=3D"border-left: 1px solid rgb(204, 204, 204); margin= : 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> <br> ?<br> <br> But now layman -S give me error :(<br> "<br> >From git://<a href=3D"http://git.overlays.gentoo.org/proj/perl-overlay" tar= get=3D"_blank">git.overlays.gentoo.org/proj/perl-overlay</a><br> =A0 3ddbd1a..43666a7 =A0master =A0 =A0 -> origin/master<br> You asked me to pull without telling me which branch you<br> want to merge with, and 'branch.alternatives.merge' in<br> your configuration file does not tell me either. =A0 =A0 =A0 =A0Please<br> specify which branch you want to merge on the command line and<br> try again (e.g. 'git pull <repository> <refspec>').<br> See git-pull(1) for details.<br> "<br> </blockquote><div><br>This is because above, you appeared to have created a= new branch called 'alternatives' with no remote name. <br><br>So w= hen you run "git pull -u -v" in that checked out branch ( what la= yman does ), it will be going "Ok, you want to update the current bran= ch, hold on, the hell? update from what?!. <br> =A0<br></div><blockquote class=3D"gmail_quote" style=3D"border-left: 1px so= lid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><br> What am I doing wrong?<br> <br> Anyway, thanks for advice :)<br> <br> P.S.<br> 5.10.1 out - woohoo :)<br> <font color=3D"#888888"><br> --<br> </font><div><div></div><div class=3D"h5">Sergiy Borodych<br> <a href=3D"http://bor.org.ua" target=3D"_blank">http://bor.org.ua</a><br> <br> </div></div></blockquote></div><br><br><font size=3D"4">But you no longer n= eed to worry about the branch, as we just merged the branch back into maste= r :D </font><br><br>Note, we have 5.10.1 out, *and in overlay* now :D <br> <br>$ cd /tmp/<br>$ mkdir overlay <br>$ cd overlay <br>$ git clone git://<a= href=3D"http://git.overlays.gentoo.org/proj/perl-overlay">git.overlays.gen= too.org/proj/perl-overlay</a><br><br><span style=3D"font-family: courier ne= w,monospace;">Initialized empty Git repository in /tmp/overlay/perl-overlay= /.git/</span><br style=3D"font-family: courier new,monospace;"> <span style=3D"font-family: courier new,monospace;">remote: Counting object= s: 11533, done.</span><br style=3D"font-family: courier new,monospace;"><sp= an style=3D"font-family: courier new,monospace;">remote: Compressing object= s: 100% (6340/6340), done.</span><br style=3D"font-family: courier new,mono= space;"> <span style=3D"font-family: courier new,monospace;">remote: Total 11533 (de= lta 6653), reused 8927 (delta 5110)</span><br style=3D"font-family: courier= new,monospace;"><span style=3D"font-family: courier new,monospace;">Receiv= ing objects: 100% (11533/11533), 2.14 MiB | 426 KiB/s, done.</span><br styl= e=3D"font-family: courier new,monospace;"> <span style=3D"font-family: courier new,monospace;">Resolving deltas: 100% = (6653/6653), done.</span><br style=3D"font-family: courier new,monospace;">= <br>$ cd perl-overlay/<br>$ find dev-lang/perl <br><br><span style=3D"font-= family: courier new,monospace;">dev-lang/perl/</span><br style=3D"font-fami= ly: courier new,monospace;"> <span style=3D"font-family: courier new,monospace;">dev-lang/perl/perl-5.10= .1-r11.ebuild</span><br style=3D"font-family: courier new,monospace;"><span= style=3D"font-family: courier new,monospace;">dev-lang/perl/metadata.xml</= span><br style=3D"font-family: courier new,monospace;"> <span style=3D"font-family: courier new,monospace;">dev-lang/perl/Manifest<= /span><br style=3D"font-family: courier new,monospace;"><span style=3D"font= -family: courier new,monospace;">dev-lang/perl/ChangeLog</span><br style=3D= "font-family: courier new,monospace;"> <br>$ git pull -u -v <br><br><span style=3D"font-family: courier new,monosp= ace;">From git://<a href=3D"http://git.overlays.gentoo.org/proj/perl-overla= y">git.overlays.gentoo.org/proj/perl-overlay</a></span><br style=3D"font-fa= mily: courier new,monospace;"> <span style=3D"font-family: courier new,monospace;">=A0=3D [up to date]=A0= =A0=A0=A0=A0 master=A0=A0=A0=A0 -> origin/master</span><br style=3D"font= -family: courier new,monospace;"><span style=3D"font-family: courier new,mo= nospace;">Already up-to-date.</span><br style=3D"font-family: courier new,m= onospace;"> <br><br clear=3D"all"><br>-- <br>Kent <br><br>perl -e =A0"print substr= ( \"edrgmaM =A0SPA NOcomil.ic\\@tfrken\", \$_ * 3, 3 ) for ( 9,8,= 0,7,1,6,5,4,3,2 );"<br><br><a href=3D"http://kent-fredric.fox.geek.nz"= >http://kent-fredric.fox.geek.nz</a><br> --0022150484477547bf0471fb7f19--