On Jun 05, 08 22:54:58 +0100, R.M. Thomas wrote:
Coleman Kane wrote: > master is tracking 1.6 (1.5.99.x) development, the server-1.5-branch is
tracking 1.4.99.x development. Should we be pulling from that, instead?
I tried to repeat the build with an older version of xserver by adding the single line
git-checkout -b server-1.4-branch
this should read git-checkout -b server-1.4-branch --track origin/server-1.4-branch (remember you already created your own branch, so you probably need to 'git-checkout master; git-branch -d server-1.4-branch' first). Alternatively, you can checkout the branch in a non-tracking read-only way: git-checkout origin/server-1.4-branch
to my shell script immediately after the line "cd $SRC/xserver". But it seems this did not achieve what I intended (bad syntax?), because when I ran the new Xorg executable I got the same line
X.Org X Server 1.5.99.1
Because you created a new branch at the previously checked out version.
HTH
Matthias
--
Matthias Hopf