Code Repository
-Mesa uses git +Mesa uses git as its source code management system.
+The master git repository is hosted on -freedesktop.org. +freedesktop.org.
@@ -28,14 +36,13 @@ You may access the repository either as an
You may also browse the main Mesa git repository and the +>browse the main Mesa git repository and the Mesa demos and tests git repository. +>Mesa demos and tests git repository.
- -Anonymous git Access
+Anonymous git Access
To get the Mesa sources anonymously (read-only):
@@ -58,16 +65,15 @@ To get the Mesa sources anonymously (read-only):
-
-
Mesa developers need to first have an account on
-freedesktop.org.
+freedesktop.org.
To get an account, please ask Brian or the other Mesa developers for
permission.
Then, if there are no objections, follow this
-
+
procedure.
-If you're
+If you're
using git on Windows you'll want to enable automatic CR/LF conversion in
your local copy of the repository:
At any given time, there may be several active branches in Mesa's
@@ -133,7 +138,7 @@ Questions about branch status/activity should be posted to the
mesa3d-dev mailing list.
Otherwise, you have to say
-If you are an experienced git user working on substancial modifications,
+If you are an experienced git user working on substantial modifications,
you are probably
working on a separate branch and would rebase your branch prior to
merging with master.
@@ -163,6 +169,7 @@ If it has been awhile since you've done the initial clone, try
to get the latest files before you start working.
@@ -171,6 +178,7 @@ Make your changes and use
git add <files to commit>
git commit
+
to get your changes ready to push back into the fd.o repository.
@@ -186,12 +194,13 @@ To avoid this,
git pull --rebase
git push
+
If you are familiar with CVS or similar system, this is similar to doing a
-See Understanding Git Conceptually for a fairly clear explanation about all of this.
+See Understanding Git Conceptually for a fairly clear explanation about all of this.
Developer git Access
+Developer git Access
Windows Users
+Windows Users
-
-Development Branches
+Development Branches
Developer Git Tips
+Developer Git Tips
+ git pull origin master
each time you do a pull.
git pull
+ cvs update
in order to update your source tree to
the current repository state, instead of the time you did the last update.
(CVS doesn't work like git in this respect, but this is easiest way
to explain it.)
-
+
In any case, your repository now looks like you made your changes after
all the other changes.