help on start using git on a gnomeweb-wml project

[Xavi de Blas-2]

Hello all

i'm using git on my project: chronojump, but i don't know how to start
cloning it's gnomeweb-wml page

if i do this:
git clone ssh://xaviblas@.../git/gnomeweb-wml

i clone all the projects page, but i only want to clone mine (chronojump)

here what i want to clone:
http://git.gnome.org/cgit/gnomeweb-wml/tree/projects.gnome.org/chronojump

sorry, i'm sure it has to be really simple but i haven't read solution
on documentation and i cannot chat

bye
_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list

[Michele Mattioni]

On Mon, May 4, 2009 at 6:49 PM, Xavi de Blas <xaviblas@...> wrote:

> Hello all
>
> i'm using git on my project: chronojump, but i don't know how to start
> cloning it's gnomeweb-wml page
>
> if i do this:
> git clone ssh://xaviblas@.../git/gnomeweb-wml
>
> i clone all the projects page, but i only want to clone mine (chronojump)
>
> here what i want to clone:
> http://git.gnome.org/cgit/gnomeweb-wml/tree/projects.gnome.org/chronojump
>
> sorry, i'm sure it has to be really simple but i haven't read solution
> on documentation and i cannot chat

Hi Xavi,

I'm hitting the same problem here and I didn't find a solution yet.

..
_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list

[Jaap A. Haitsma]

Hi,

I'm pretty sure the answer is that it is not possible you need to
clone gnomeweb-wml entirely.

The first clone takes quite a while (it's about 500MB of data) but
after that updating (git pull) is pretty fast.

Jaap

On Mon, May 18, 2009 at 12:21, Michele Mattioni <mattions@...> wrote:

> On Mon, May 4, 2009 at 6:49 PM, Xavi de Blas <xaviblas@...> wrote:
>> Hello all
>>
>> i'm using git on my project: chronojump, but i don't know how to start
>> cloning it's gnomeweb-wml page
>>
>> if i do this:
>> git clone ssh://xaviblas@.../git/gnomeweb-wml
>>
>> i clone all the projects page, but i only want to clone mine (chronojump)
>>
>> here what i want to clone:
>> http://git.gnome.org/cgit/gnomeweb-wml/tree/projects.gnome.org/chronojump
>>
>> sorry, i'm sure it has to be really simple but i haven't read solution
>> on documentation and i cannot chat
>
> Hi Xavi,
>
> I'm hitting the same problem here and I didn't find a solution yet.
>
> ..
> _______________________________________________
> gnome-web-list mailing list
> gnome-web-list@...
> http://mail.gnome.org/mailman/listinfo/gnome-web-list
>

_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list

[Xavi de Blas-2]

Hello

And if i locally delete the files of all the projects i don't need...
howto ignore them when i push the changes to my project?

bye, thanks


2009/5/18 Jaap A. Haitsma <jaap@...>:

> Hi,
>
> I'm pretty sure the answer is that it is not possible you need to
> clone gnomeweb-wml entirely.
>
> The first clone takes quite a while (it's about 500MB of data) but
> after that updating (git pull) is pretty fast.
>
> Jaap
>
> On Mon, May 18, 2009 at 12:21, Michele Mattioni <mattions@...> wrote:
>> On Mon, May 4, 2009 at 6:49 PM, Xavi de Blas <xaviblas@...> wrote:
>>> Hello all
>>>
>>> i'm using git on my project: chronojump, but i don't know how to start
>>> cloning it's gnomeweb-wml page
>>>
>>> if i do this:
>>> git clone ssh://xaviblas@.../git/gnomeweb-wml
>>>
>>> i clone all the projects page, but i only want to clone mine (chronojump)
>>>
>>> here what i want to clone:
>>> http://git.gnome.org/cgit/gnomeweb-wml/tree/projects.gnome.org/chronojump
>>>
>>> sorry, i'm sure it has to be really simple but i haven't read solution
>>> on documentation and i cannot chat
>>
>> Hi Xavi,
>>
>> I'm hitting the same problem here and I didn't find a solution yet.
>>
>> ..
>> _______________________________________________
>> gnome-web-list mailing list
>> gnome-web-list@...
>> http://mail.gnome.org/mailman/listinfo/gnome-web-list
>>
>

_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list

[Jaap A. Haitsma]

On Mon, May 18, 2009 at 18:49, Xavi de Blas <xaviblas@...> wrote:
> Hello
>
> And if i locally delete the files of all the projects i don't need...
> howto ignore them when i push the changes to my project?
>
I don't think that works. Maybe a good idea to start helping with the
gnome plone project. This will make it a lot easier to make some
changes to a web page

Jaap

> bye, thanks
>
>
> 2009/5/18 Jaap A. Haitsma <jaap@...>:
>> Hi,
>>
>> I'm pretty sure the answer is that it is not possible you need to
>> clone gnomeweb-wml entirely.
>>
>> The first clone takes quite a while (it's about 500MB of data) but
>> after that updating (git pull) is pretty fast.
>>
>> Jaap
>>
>> On Mon, May 18, 2009 at 12:21, Michele Mattioni <mattions@...> wrote:
>>> On Mon, May 4, 2009 at 6:49 PM, Xavi de Blas <xaviblas@...> wrote:
>>>> Hello all
>>>>
>>>> i'm using git on my project: chronojump, but i don't know how to start
>>>> cloning it's gnomeweb-wml page
>>>>
>>>> if i do this:
>>>> git clone ssh://xaviblas@.../git/gnomeweb-wml
>>>>
>>>> i clone all the projects page, but i only want to clone mine (chronojump)
>>>>
>>>> here what i want to clone:
>>>> http://git.gnome.org/cgit/gnomeweb-wml/tree/projects.gnome.org/chronojump
>>>>
>>>> sorry, i'm sure it has to be really simple but i haven't read solution
>>>> on documentation and i cannot chat
>>>
>>> Hi Xavi,
>>>
>>> I'm hitting the same problem here and I didn't find a solution yet.
>>>
>>> ..
>>> _______________________________________________
>>> gnome-web-list mailing list
>>> gnome-web-list@...
>>> http://mail.gnome.org/mailman/listinfo/gnome-web-list
>>>
>>
>

_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list

[Michele Mattioni]

On Mon, May 18, 2009 at 7:47 PM, Jaap A. Haitsma <jaap@...> wrote:

> On Mon, May 18, 2009 at 18:49, Xavi de Blas <xaviblas@...> wrote:
>> Hello
>>
>> And if i locally delete the files of all the projects i don't need...
>> howto ignore them when i push the changes to my project?
>>
> I don't think that works. Maybe a good idea to start helping with the
> gnome plone project. This will make it a lot easier to make some
> changes to a web page
>
> Jaap
>

It's a wild guess but what will happen if I:

clone the repo gnome-wml
branch locally
remove all the other projects leaving only mine with the right structure
commit the branch (branch here is diverging from master)
push this local branch as a new remote branch

Ask ppl to get only that branch.

I think there should be a way to get _only one_ specified remote
branch and to have always the other listed in the local git repo, but
without the content being downloaded.

I think this will raise a lot of issues from an infrastructure and
maintenance point of view:
# I'm thinking about the rename of the domain that murray has made
long time ago...)
# The scripts that sync the website content with the git repo has to
be completely restructured. (It has to pull from master otherwise from
the branch name corresponding to the website)

I don't know if there are better solutions.

Cheers,
Michele.
_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list

[Xavi de Blas-2]

Hello, still without a solution

I cloned all:

git clone ssh://xaviblas@.../git/gnomeweb-wml

then git add, then git commit -a, but when pushing:

git push:

To ssh://xaviblas@.../git/gnomeweb-wml
 ! [rejected]        master -> master (non-fast forward)
error: failed to push some refs to 'ssh://xaviblas@.../git/gnomeweb-wml'

can anyone help?

thanks

2009/5/19 Michele Mattioni <mattions@...>

On Mon, May 18, 2009 at 7:47 PM, Jaap A. Haitsma <jaap@...> wrote:
> On Mon, May 18, 2009 at 18:49, Xavi de Blas <xaviblas@...> wrote:
>> Hello
>>
>> And if i locally delete the files of all the projects i don't need...
>> howto ignore them when i push the changes to my project?
>>
> I don't think that works. Maybe a good idea to start helping with the
> gnome plone project. This will make it a lot easier to make some
> changes to a web page
>
> Jaap
>

It's a wild guess but what will happen if I:

clone the repo gnome-wml
branch locally
remove all the other projects leaving only mine with the right structure
commit the branch (branch here is diverging from master)
push this local branch as a new remote branch

Ask ppl to get only that branch.

I think there should be a way to get _only one_ specified remote
branch and to have always the other listed in the local git repo, but
without the content being downloaded.

I think this will raise a lot of issues from an infrastructure and
maintenance point of view:
# I'm thinking about the rename of the domain that murray has made
long time ago...)
# The scripts that sync the website content with the git repo has to
be completely restructured. (It has to pull from master otherwise from
the branch name corresponding to the website)

I don't know if there are better solutions.

Cheers,
Michele.

_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list

[Michele Mattioni]

On Wed, Jul 1, 2009 at 2:28 PM, Xavi de Blas<xaviblas@...> wrote:
> Hello, still without a solution
>
> I cloned all:
>
> git clone ssh://xaviblas@.../git/gnomeweb-wml
>

Hi,

you always work in your own branch.

git checkout -b my_branch

Hack Hack Hack

1. git add .
2. git commit -m "My commit message here"
3. git checkout master
4. git pull # get all the changes happened in master
5. git checkout my_branch # Back in my_branch
6. git rebase master #The Black magic. Commit all you change on top of
the master ones
7. git checkout master # Back in master
8. git merge my_branch # It’s gonna be a fast forward merge
9. git push


instead of
5.
6.
7.

you can do
5b. git merge my_branch (when you are in master)

This will try to do a normal merge, if it fails you have to solve the
conflicts with
6b. git mergetool
and commit
7b. git ci -am "Solved the conflicts"


My two cents,
Michele.
_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list

[Xavi de Blas-2]

Worked, thanks, not sure if i understand, but now it will be easier to try to get what each command does

bye, thanks

2009/7/1 Michele Mattioni <mattions@...>

On Wed, Jul 1, 2009 at 2:28 PM, Xavi de Blas<xaviblas@...> wrote:
> Hello, still without a solution
>
> I cloned all:
>
> git clone ssh://xaviblas@.../git/gnomeweb-wml
>

Hi,

you always work in your own branch.

git checkout -b my_branch

Hack Hack Hack

1. git add .
2. git commit -m "My commit message here"
3. git checkout master
4. git pull # get all the changes happened in master
5. git checkout my_branch # Back in my_branch
6. git rebase master #The Black magic. Commit all you change on top of
the master ones
7. git checkout master # Back in master
8. git merge my_branch # It’s gonna be a fast forward merge
9. git push


instead of
5.
6.
7.

you can do
5b. git merge my_branch (when you are in master)

This will try to do a normal merge, if it fails you have to solve the
conflicts with
6b. git mergetool
and commit
7b. git ci -am "Solved the conflicts"


My two cents,
Michele.

_______________________________________________
gnome-web-list mailing list
gnome-web-list@...
http://mail.gnome.org/mailman/listinfo/gnome-web-list