← Back to branch summary

~brz/brz-debian/byoci

« back to all changes in this revision

Viewing changes to doc/user_manual/index.rst

  • Committer: James Westby
  • Date: 2009-02-18 18:36:18 UTC
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: jw+debian@jameswestby.net-20090218183618-0wuajt2nbtpcooag
Kill off export-upstream mode.

merge-upstream will be improved to merge the upstream branch, store it with
pristine-tar, and then produce the tarball as needed.

Using export-upstream for snapshots is now incorrect. You should use
"merge-upstream" every time instead, which will track if there is nothing
to do, and handle conflicts. You can autocommit the merge and build the
result if you like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/user_manual/index.rst
44
44
  * `Normal mode`_
45
45
  * `Native mode`_
46
46
  * `Merge mode`_
47
 
  * `Export-upstream mode`_
48
47
  * `Split mode`_
49
48
 
50
49
.. _Normal mode: normal.html
51
50
.. _Merge mode: merge.html
52
51
.. _Native mode: native.html
53
52
.. _Split mode: split.html
54
 
.. _Export-upstream mode: export_upstream.html
55
53
 
56
54
The remainder of the documentation explains general features of the package.
57
55
These sections are