Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-perl
Navigation:
Lists: gentoo-perl: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-perl@g.o
From: Kent Fredric <kentfredric@...>
Subject: Re: perl-5.10.1_rc2 and patches
Date: Wed, 26 Aug 2009 06:28:15 +1200
Read all of my response before doing anything ;) <br><br><div class="gmail_quote">On Wed, Aug 26, 2009 at 1:05 AM, Sergiy Borodych <span dir="ltr">&lt;<a href="mailto:bor@...">bor@...</a>&gt;</span> wrote:<br>
<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div class="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 &#39;alternatives&#39; which can not be resolved as<br>
commit?</blockquote><div> <br>I Meant &#39;git checkout -b alternatives origin/alternatives&#39; , which checkouts out the remote branch &#39;alternatives&#39; ( on origin  ) locally. <br><br></div><div><br></div><blockquote class="gmail_quote" style="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 &#39;checkout -b alternatives&#39;  just checks out the current branch under the name &#39;alternatives&#39;, not what you want.  &#39;git pull origin alternatives&#39; will then *merge* the foreign branch called &quot;alternatives&quot; into the local branch called &quot;alternatives&quot; ( a derivative of master) , which is not necessarily what you want in all cases. <br>
 <br>git checkout -b NewbranchName remoteName/branchname <br><br>Is how I recommend you check out branches locally. <br><br></div><blockquote class="gmail_quote" style="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>
&quot;<br>
From git://<a href="http://git.overlays.gentoo.org/proj/perl-overlay" target="_blank">git.overlays.gentoo.org/proj/perl-overlay</a><br>
   3ddbd1a..43666a7  master     -&gt; origin/master<br>
You asked me to pull without telling me which branch you<br>
want to merge with, and &#39;branch.alternatives.merge&#39; in<br>
your configuration file does not tell me either.        Please<br>
specify which branch you want to merge on the command line and<br>
try again (e.g. &#39;git pull &lt;repository&gt; &lt;refspec&gt;&#39;).<br>
See git-pull(1) for details.<br>
&quot;<br>
</blockquote><div><br>This is because above, you appeared to have created a new branch called &#39;alternatives&#39; with no remote name. <br><br>So when you run &quot;git pull -u -v&quot; in that checked out branch ( what layman does ), it will be going &quot;Ok, you want to update the current branch, hold on, the hell? update from what?!. <br>
 <br></div><blockquote class="gmail_quote" style="border-left: 1px solid 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="#888888"><br>
--<br>
</font><div><div></div><div class="h5">Sergiy Borodych<br>
<a href="http://bor.org.ua" target="_blank">http://bor.org.ua</a><br>
<br>
</div></div></blockquote></div><br><br><font size="4">But you no longer need to worry about the branch, as we just merged the branch back into master :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="http://git.overlays.gentoo.org/proj/perl-overlay">git.overlays.gentoo.org/proj/perl-overlay</a><br><br><span style="font-family: courier new,monospace;">Initialized empty Git repository in /tmp/overlay/perl-overlay/.git/</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">remote: Counting objects: 11533, done.</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">remote: Compressing objects: 100% (6340/6340), done.</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">remote: Total 11533 (delta 6653), reused 8927 (delta 5110)</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">Receiving objects: 100% (11533/11533), 2.14 MiB | 426 KiB/s, done.</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">Resolving deltas: 100% (6653/6653), done.</span><br style="font-family: courier new,monospace;"><br>$ cd perl-overlay/<br>$ find dev-lang/perl <br><br><span style="font-family: courier new,monospace;">dev-lang/perl/</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">dev-lang/perl/perl-5.10.1-r11.ebuild</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">dev-lang/perl/metadata.xml</span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;">dev-lang/perl/Manifest</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">dev-lang/perl/ChangeLog</span><br style="font-family: courier new,monospace;">
<br>$ git pull -u -v <br><br><span style="font-family: courier new,monospace;">From git://<a href="http://git.overlays.gentoo.org/proj/perl-overlay">git.overlays.gentoo.org/proj/perl-overlay</a></span><br style="font-family: courier new,monospace;">
<span style="font-family: courier new,monospace;"> = [up to date]      master     -&gt; origin/master</span><br style="font-family: courier new,monospace;"><span style="font-family: courier new,monospace;">Already up-to-date.</span><br style="font-family: courier new,monospace;">
<br><br clear="all"><br>-- <br>Kent <br><br>perl -e  &quot;print substr( \&quot;edrgmaM  SPA NOcomil.ic\\@tfrken\&quot;, \$_ * 3, 3 ) for ( 9,8,0,7,1,6,5,4,3,2 );&quot;<br><br><a href="http://kent-fredric.fox.geek.nz">http://kent-fredric.fox.geek.nz</a><br>

Replies:
Re: perl-5.10.1_rc2 and patches
-- Sergiy Borodych
References:
perl-5.10.1_rc2 and patches
-- Sergiy Borodych
Re: perl-5.10.1_rc2 and patches
-- Nikolai Drozd
Re: perl-5.10.1_rc2 and patches
-- Sergiy Borodych
Re: perl-5.10.1_rc2 and patches
-- Kent Fredric
Re: perl-5.10.1_rc2 and patches
-- Sergiy Borodych
Navigation:
Lists: gentoo-perl: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Re: perl-5.10.1_rc2 and patches
Next by thread:
Re: perl-5.10.1_rc2 and patches
Previous by date:
Re: perl-5.10.1_rc2 and patches
Next by date:
280728 - Perl packages should install to vendor and not site (was: BugDay is Saturday, October 3rd)


Updated Sep 25, 2011

Summary: Archive of the gentoo-perl mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.