On Wednesday 07 December 2011 09:50:51 Koen Kooi wrote: > One of the big problems with the old testlab code was that using multiple > buildslaves created a huge mess for the git repo. What do you think about > doing this the following before the 'git add'? > > git pull -q -s recursive -X theirs ${BUILDHISTORY_PULL_REPO} > > I'm not sure what the right incantation is to ensure git updates the current > branch, but the point is mainly about using the 'theirs' strategy.
I think you can just have the branch name as part of BUILDHISTORY_PULL_REPO (i.e. "reponame branchname"). I had considered using separate branches for each machine to avoid this problem but if you're already using branches for different versions this will get messy. (As an aside I guess we ought to include the hostname in the commit message as well.) Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core