You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Each source file should contain the $Id$ keyword. This will be expanded by SVN
189
-
to contain useful information about the file, revision, last committer, and
190
-
date/time of last checkin.
187
+
=== Keyword Substitution ===
191
188
192
-
Place the keyword right after the standard header/license that is found at the
193
-
top of each source file:
194
-
```
195
-
/* $Id$ */
196
-
```
197
-
198
-
You also need to set
199
-
200
-
svn propset svn:keywords "Id"
201
-
202
-
for the new files.
189
+
In the days of SVN we used to require that each source file should contain the
190
+
$Id$ keyword. Keyword substitution is not supported by GIT and so should no
191
+
longer be used.
203
192
204
193
== Variable Names ==
205
194
Variable names begin with a lower case letter and are formed using mixed case.
@@ -416,45 +405,48 @@ You should also really read this article from Qt Quarterly on
416
405
417
406
418
407
419
-
= SVN Access =
408
+
= GIT Access =
420
409
421
-
This page describes how to get started using the QGIS Subversion repository
410
+
This section describes how to get started using the QGIS GIT repository. Before you can do this, you need to first have a git client installed on your system. Debian based distro users can do:
422
411
423
-
== Accessing the Repository ==
424
-
To check out QGIS HEAD:
425
412
```
426
-
svn --username [your user name] co https://svn.osgeo.org/qgis/trunk/qgis
413
+
sudo apt-get install git
427
414
```
428
415
416
+
Windows users can obtain [msys git http://code.google.com/p/msysgit/].
417
+
429
418
430
-
== Anonymous Access ==
431
-
You can use the following commands to perform an anonymous checkout from the
432
-
QGIS Subversion repository. Note we recommend checking out the trunk (unless
433
-
you are a developer or really HAVE to have the latest changes and don't mind
434
-
lots of crashing!).
435
419
436
-
You must have a subversion client installed prior to checking out the code. See
437
-
the Subversion website for more information. The Links page contains a good
438
-
selection of SVN clients for various platforms.
420
+
== Accessing the Repository ==
421
+
422
+
To clone QGIS master:
439
423
440
-
To check out a branch
441
424
```
442
-
svn co https://svn.osgeo.org/qgis/branches/<branch name>
425
+
git://github.com/qgis/Quantum-GIS.git
443
426
```
444
427
445
-
To check out SVN stable trunk:
428
+
== Check out a branch ==
446
429
430
+
To check out a branch, for example the release 1.7.0 branch do:
447
431
```
448
-
svn co https://svn.osgeo.org/qgis/trunk/qgis qgis_trunk
432
+
cd Quantum-GIS
433
+
git fetch
434
+
git branch --track origin release-1_7_0
435
+
git checkout release-1_7_0
436
+
449
437
```
450
438
451
-
/!\ **Note:** If you are behind a proxy server, edit your ~/subversion/servers
452
-
file to specify your proxy settings first!
439
+
To check out the master branch:
453
440
454
-
/!\ **Note:** In QGIS we keep our most stable code in the version 1_0 branch.
455
-
Trunk contains code for the so called 'unstable' release series. Periodically
456
-
we will tag a release off trunk, and then continue stabilisation and selective
457
-
incorporation of new features into trunk.
441
+
```
442
+
cd Quantum-GIS
443
+
git checkout master
444
+
```
445
+
446
+
/!\ **Note:** In QGIS we keep our most stable code in the current release branch.
447
+
Master contains code for the so called 'unstable' release series. Periodically
448
+
we will branch a release off master, and then continue stabilisation and selective
449
+
incorporation of new features into master.
458
450
459
451
See the INSTALL file in the source tree for specific instructions on building
460
452
development versions.
@@ -466,19 +458,17 @@ If you're interested in checking out Quantum GIS documentation sources:
466
458
svn co https://svn.osgeo.org/qgis/docs/trunk qgis_docs
467
459
```
468
460
461
+
/!\ **Note:** This url will change to a git URL in the near future.
462
+
469
463
You can also take a look at DocumentationWritersCorner for more information.
470
464
471
-
== SVN Documentation ==
472
-
473
-
The repository is organized as follows:
474
-
475
-
http://wiki.qgis.org/images/repo.png
476
-
477
-
See the Subversion book http://svnbook.red-bean.com for information on becoming
478
-
a SVN master.
479
-
465
+
== GIT Documentation ==
480
466
467
+
See the following sites for information on becoming a GIT master.
481
468
469
+
http://gitref.org
470
+
http://progit.org
471
+
http://gitready.com
482
472
483
473
== Development in branches ==
484
474
@@ -488,8 +478,8 @@ last years. Therefore it is hard to anticipate the side effects that the
488
478
addition of a feature will have. In the past, the QGIS project had very long
489
479
release cycles because it was a lot of work to reetablish the stability of the
490
480
software system after new features were added. To overcome these problems, QGIS
491
-
switched to a development model where new features are coded in svn branches
492
-
first and merged to trunk (the main branch) when they are finished and stable.
481
+
switched to a development model where new features are coded in GIT branches
482
+
first and merged to master (the main branch) when they are finished and stable.
493
483
This section describes the procedure for branching and merging in the QGIS
494
484
project.
495
485
@@ -503,75 +493,43 @@ technical advisor of the project steering committee (PSC). If the new feature
503
493
requires any changes to the QGIS architecture, a request for comment (RFC) is
504
494
needed.
505
495
506
-
- **Create a branch:**
507
-
Create a new svn branch for the development of the new feature (see
508
-
UsingSubversion for the svn syntax). Now you can start developing.
509
-
510
-
- **Merge from trunk regularly:**
511
-
It is recommended to merge the changes in trunk to the branch on a regular
512
-
basis. This makes it easier to merge the branch back to trunk later.
513
-
514
-
- **Documentation on wiki:**
515
-
It is also recommended to document the intended changes and the current status
516
-
of the work on a wiki page.
517
-
518
-
- **Testing before merging back to trunk:**
519
-
When you are finished with the new feature and happy with the stability, make
520
-
an announcement on the developer list. Before merging back, the changes will
521
-
be tested by developers and users. Binary packages (especially for OsX and
522
-
Windows) will be generated to also involve non-developers. In trac, a new
523
-
Component will be opened to file tickets against. Once there are no remaining
524
-
issues left, the technical advisor of the PSC merges the changes into trunk.
525
-
526
-
-
527
-
528
-
=== Creating a branch ===
529
-
530
-
We prefer that new feature developments happen out of trunk so that trunk
531
-
remains in a stable state. To create a branch use the following command:
496
+
**Create a branch:**
497
+
Create a new GIT branch for the development of the new feature.
0 commit comments