importers.page in autoproj-1.5.3

- old
+ new

@@ -16,16 +16,20 @@
 {coderay}
 
 Autoproj follows the following rules to find the importer definition for a given
 package:
  
- - it looks *in reverse order* in the package sets listed in the manifest file,
-   and will take the definition from the *first* package set that has one.
- - in the source.yml file, it will match the package's name with the
-   package\_name fields. It will consider every matching block (i.e. every
-   package\_name that matches), overriding earlier options by later ones.
+ - it loads the information contained in the version_control section of the
+   package set that defines the considered package
+ - it will apply any modification that is contained in the overrides section by
+   the package sets listed *after* the aforementionned package set
 
+For both the version_control and overrides section, autoproj will match the
+package's name with the package\_name fields. It will consider every matching
+block (i.e. every package\_name that matches), overriding earlier setup by later
+ones.
+
 As an example, let's consider the following manifest:
 
 {coderay:: ruby}
 package_sets:
     - rubim.base
@@ -45,25 +49,23 @@
 {coderay}
 
 Finally, the rubim.drivers package set has:
 
 {coderay:: ruby}
-version_control:
+overrides:
     - orocos/logger:
-        type: git
-        url: git://github.com/$PACKAGE.git
         branch: perf
 {coderay}
 
 Then, the following will happen:
 
  * all packages that are prefixed with "orocos/" will match the general
    definition of rubim.orocos.
  * in addition, the 'branch' flag of orocos/orocos.rb will be overriden from
    'master' (the default) to 'roby'
  * in the case of orocos/logger, since there is a matching definition in
-   rubim.drivers, the definition in rubim.orocos *is not used at all*. Only the
-   definition found in rubim.drivers' source.yml file matters.
+   the overrides section of rubim.drivers, the 'perf' branch will be checked out
+   instead of the 'roby' branch, keeping the same importer type and URL
 
 The remaining of this page will detail the various options that exist to import
 a source package.
 
 Git {#all_importers}