X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Frepository.html;h=802c9a235cb28fa4e80188fc34b1d6265b1aff01;hb=dc79b8840248ccc1860ae740f16f0f5309191445;hp=954bd0d42e6bf0fd696f07883cf221860e9fd7c9;hpb=bcc13b74443137043e8a34f8cb64a5add0d8af93;p=mesa.git diff --git a/docs/repository.html b/docs/repository.html index 954bd0d42e6..802c9a235cb 100644 --- a/docs/repository.html +++ b/docs/repository.html @@ -1,20 +1,29 @@ - - -Code Repository - - - - + + + + + Code Repository + + + + +
+

The Mesa 3D Graphics Library

+
+ + +

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.

@@ -26,15 +35,14 @@ You may access the repository either as an

You may also -browse the main Mesa git repository and the -Mesa demos and tests git repository. +browse the main Mesa git repository and the +Mesa demos and tests git repository.

- -

Anonymous git Access

+

Anonymous git Access

To get the Mesa sources anonymously (read-only): @@ -57,25 +65,43 @@ To get the Mesa sources anonymously (read-only): - -

Developer git Access

+

Developer git Access

-Mesa developers need to first have an account on -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 wish to become a Mesa developer with git-write privilege, please +follow this procedure:

+
    +
  1. Subscribe to the +mesa-dev +mailing list. +
  2. Start contributing to the project by +submitting patches to +the mesa-dev list. Specifically, +
      +
    • Use git send-mail to post your patches to mesa-dev. +
    • Wait for someone to review the code and give you a Reviewed-by +statement. +
    • You'll have to rely on another Mesa developer to push your initial patches +after they've been reviewed. +
    +
  3. After you've demonstrated the ability to write good code and have had +a dozen or so patches accepted you can apply for an account. +
  4. Occasionally, but rarely, someone may be given a git account sooner, but +only if they're being supervised by another Mesa developer at the same +organization and planning to work in a limited area of the code or on a +separate branch. +
  5. To apply for an account, follow +these directions. +It's also appreciated if you briefly describe what you intend to do (work +on a particular driver, add a new extension, etc.) in the bugzilla record. +

Once your account is established:

    -
  1. Install the git software on your computer if needed.

  2. Get an initial, local copy of the repository with: 
         git clone git+ssh://username@git.freedesktop.org/git/mesa/mesa
@@ -92,10 +118,10 @@ Once your account is established:
-

Windows Users

+

Windows Users

-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:

@@ -113,13 +139,12 @@ Unix users don't need to set this option.
- -

Development Branches

+

Development Branches

At any given time, there may be several active branches in Mesa's repository. -Generally, the trunk contains the latest development (unstable) +Generally, master contains the latest development (unstable) code while a branch has the latest stable code.

@@ -132,7 +157,7 @@ Questions about branch status/activity should be posted to the mesa3d-dev mailing list.

-

Developer Git Tips

+

Developer Git Tips

  1. Setting up to edit the master branch @@ -144,12 +169,13 @@ branch, try: git config branch.master.remote origin git config branch.master.merge master +

    Otherwise, you have to say git pull origin master each time you do a pull.

  2. Small changes to master

    -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. @@ -162,6 +188,7 @@ If it has been awhile since you've done the initial clone, try 

         git pull
    +

    to get the latest files before you start working.

    @@ -170,6 +197,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.

    @@ -185,12 +213,13 @@ To avoid this, git pull --rebase git push +

    If you are familiar with CVS or similar system, this is similar to doing a 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.

    @@ -206,11 +235,10 @@ If you want the rebase action to be the default action, then git config --global branch.autosetuprebase=always

    -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.

+
- -