1 |
On 08/25/09 21:28, Kent Fredric wrote: |
2 |
> Read all of my response before doing anything ;) |
3 |
ok :) |
4 |
> |
5 |
> On Wed, Aug 26, 2009 at 1:05 AM, Sergiy Borodych <bor@×××××××××.ua |
6 |
> <mailto:bor@×××××××××.ua>> wrote: |
7 |
> |
8 |
> |
9 |
> portage # cd /usr/local/portage/layman/perl-experimental |
10 |
> perl-experimental # git checkout -b alternatives alternatives |
11 |
> fatal: git checkout: updating paths is incompatible with switching |
12 |
> branches. |
13 |
> Did you intend to checkout 'alternatives' which can not be resolved as |
14 |
> commit? |
15 |
> |
16 |
> |
17 |
> I Meant 'git checkout -b alternatives origin/alternatives' , which |
18 |
> checkouts out the remote branch 'alternatives' ( on origin ) locally. |
19 |
> |
20 |
> |
21 |
> |
22 |
> I think you mean |
23 |
> |
24 |
> git checkout -b alternatives |
25 |
> git pull origin alternatives |
26 |
> |
27 |
> |
28 |
> Nah, that would just give you 2 copies of master with different names. |
29 |
> Git 'checkout -b alternatives' just checks out the current branch under |
30 |
> the name 'alternatives', not what you want. 'git pull origin |
31 |
> alternatives' will then *merge* the foreign branch called "alternatives" |
32 |
> into the local branch called "alternatives" ( a derivative of master) , |
33 |
> which is not necessarily what you want in all cases. |
34 |
> |
35 |
> git checkout -b NewbranchName remoteName/branchname |
36 |
> |
37 |
> Is how I recommend you check out branches locally. |
38 |
> |
39 |
> |
40 |
> ? |
41 |
> |
42 |
> But now layman -S give me error :( |
43 |
> " |
44 |
> From git://git.overlays.gentoo.org/proj/perl-overlay |
45 |
> <http://git.overlays.gentoo.org/proj/perl-overlay> |
46 |
> 3ddbd1a..43666a7 master -> origin/master |
47 |
> You asked me to pull without telling me which branch you |
48 |
> want to merge with, and 'branch.alternatives.merge' in |
49 |
> your configuration file does not tell me either. Please |
50 |
> specify which branch you want to merge on the command line and |
51 |
> try again (e.g. 'git pull <repository> <refspec>'). |
52 |
> See git-pull(1) for details. |
53 |
> " |
54 |
> |
55 |
> |
56 |
> This is because above, you appeared to have created a new branch called |
57 |
> 'alternatives' with no remote name. |
58 |
> |
59 |
> So when you run "git pull -u -v" in that checked out branch ( what |
60 |
> layman does ), it will be going "Ok, you want to update the current |
61 |
> branch, hold on, the hell? update from what?!. |
62 |
> |
63 |
|
64 |
thanks for a good explanation |
65 |
|
66 |
> |
67 |
> What am I doing wrong? |
68 |
> |
69 |
> Anyway, thanks for advice :) |
70 |
> |
71 |
> P.S. |
72 |
> 5.10.1 out - woohoo :) |
73 |
> |
74 |
> -- |
75 |
> Sergiy Borodych |
76 |
> http://bor.org.ua |
77 |
> |
78 |
> |
79 |
> |
80 |
> But you no longer need to worry about the branch, as we just merged the |
81 |
> branch back into master :D |
82 |
> |
83 |
> Note, we have 5.10.1 out, *and in overlay* now :D |
84 |
|
85 |
yep |
86 |
already install it ;) |
87 |
|
88 |
> |
89 |
> $ cd /tmp/ |
90 |
> $ mkdir overlay |
91 |
> $ cd overlay |
92 |
> $ git clone git://git.overlays.gentoo.org/proj/perl-overlay |
93 |
> <http://git.overlays.gentoo.org/proj/perl-overlay> |
94 |
> |
95 |
> Initialized empty Git repository in /tmp/overlay/perl-overlay/.git/ |
96 |
> remote: Counting objects: 11533, done. |
97 |
> remote: Compressing objects: 100% (6340/6340), done. |
98 |
> remote: Total 11533 (delta 6653), reused 8927 (delta 5110) |
99 |
> Receiving objects: 100% (11533/11533), 2.14 MiB | 426 KiB/s, done. |
100 |
> Resolving deltas: 100% (6653/6653), done. |
101 |
> |
102 |
> $ cd perl-overlay/ |
103 |
> $ find dev-lang/perl |
104 |
> |
105 |
> dev-lang/perl/ |
106 |
> dev-lang/perl/perl-5.10.1-r11.ebuild |
107 |
> dev-lang/perl/metadata.xml |
108 |
> dev-lang/perl/Manifest |
109 |
> dev-lang/perl/ChangeLog |
110 |
> |
111 |
> $ git pull -u -v |
112 |
> |
113 |
> From git://git.overlays.gentoo.org/proj/perl-overlay |
114 |
> <http://git.overlays.gentoo.org/proj/perl-overlay> |
115 |
> = [up to date] master -> origin/master |
116 |
> Already up-to-date. |
117 |
> |
118 |
> |
119 |
> |
120 |
> -- |
121 |
> Kent |
122 |
> |
123 |
> perl -e "print substr( \"edrgmaM SPA NOcomil.ic\\@tfrken\", \$_ * 3, 3 |
124 |
> ) for ( 9,8,0,7,1,6,5,4,3,2 );" |
125 |
> |
126 |
> http://kent-fredric.fox.geek.nz |
127 |
|
128 |
|
129 |
-- |
130 |
Sergiy Borodych |
131 |
http://bor.org.ua |