Gentoo Archives: gentoo-perl

From: Sergiy Borodych <bor@×××××××××.ua>
To: gentoo-perl@l.g.o
Subject: Re: [gentoo-perl] perl-5.10.1_rc2 and patches
Date: Wed, 26 Aug 2009 20:32:02
Message-Id: 4A95211A.2010100@univ.kiev.ua
In Reply to: Re: [gentoo-perl] perl-5.10.1_rc2 and patches by Kent Fredric
On 08/25/09 21:28, Kent Fredric wrote:
> Read all of my response before doing anything ;)
ok :)
> > On Wed, Aug 26, 2009 at 1:05 AM, Sergiy Borodych <bor@×××××××××.ua > <mailto:bor@×××××××××.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 > <http://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?!. >
thanks for a good explanation
> > 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
yep already install it ;)
> > $ cd /tmp/ > $ mkdir overlay > $ cd overlay > $ git clone git://git.overlays.gentoo.org/proj/perl-overlay > <http://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 > <http://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
-- Sergiy Borodych http://bor.org.ua