Re: [Xenomai-help] application make file

[Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>]

Piquesel wrote:
> Le 19 juin 2010 à 13:02, Gilles Chanteperdrix a écrit :
> 
>> Bruno Rouchouse wrote:
>>> Hi Gilles,
>>> 
>>> I do understand your point an mostly agrees with it. What you say
>>> is really common sense.
>>> 
>>> However, I would object 2 points: first it's everyone's freedom
>>> to help someone or not even if it is a dummy question. In fact,
>>> due to my knowledge, I can help only on those ;)
>>> 
>>> Second, it's not so easy when you start using a technology to
>>> find all the right pointers and have all the answers. For
>>> instance, I'm still struggling with lot's of git features and
>>> workflow although everything is documented. Reading all man pages
>>> does not really help me for every use case.
>> Well maybe for git, a simple approach is to set-up some git
>> repository locally, then try git commands, without any risk to
>> break anything. You can also set-up a bare repository to play with
>> push and fetch.
>> 
> Yes that's what I did in fact. I guess I can post this use case here
> because it may be of some interest to some other xenomai users.
> 
> My workflow is quite standard I think and I did find a way to handle
> it. Not sure it is the best one though.
> 
> I clone locally from xenomai git repository. I create also my own
> branch on my local repository but I also need a git repository on
> github in order to access to my tree from different machines.
> 
> In terms of git commands, here's what I did:
> 
> * Cloned Xenomai repository on my local machine git clone
> git://xenomai.org/xenomai-head.git and created from there my own
> branch : git branch benchlib
> 
> * Pushed once this local copy to github in order to populate my
> remote repository (git push)
> 
> The thing I'm not sure about is now how to handle update process of
> my local and github repositories when xenomai-head evolves. I need to
> keep both in sync with Xenomai development tree. Makes sense?
> 
> What I do (on my local rep) currently is: (on my local repository) 
> git checkout master git pull (on my local rep) to update my tree with
> the latest xenomai commits git checkout benchlib git rebase master
> (in order to have my branch in sync with the latest release)
> 
> Here comes a first pain: I get plenty of conflicts due to Makefile.in
> changes. So what I did is just launching the bootstrap script to
> update them in my tree and then do a: git rebase --continue

You probably have conflicts because you made change locally, the answer
is simple: if you want to make changes locally, use the same version of
autotools as me, that is:
autoconf 2.65
automake 1.10.1

> 
> Finally, when my tree is up to date, I still need to update my githup
> repository and I'm not so clear on how to do that.
> 
> When I use git push git@domain.hid, I
> get some non-fast forward errors. I found some explanations on
> different forums. I'm not sure I really understand what I'm doing
> here but I get around this problem like this:
> 
> git fetch origin
> 
> and then I can push via git push -f
> git@domain.hid
> 
> Well, I don't know if I'm very clear :-) I'll draw a diagram if
> needed.

No, I do not get it here. As soon as you rebase, you modify your branch'
history and have to use push -f. There is nothing wrong with that.

-- 
					    Gilles.