|
From: Oleg B. <no...@so...> - 2017-03-07 19:34:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via bb5179f953319c1db7b98cc048d7635bd996eff4 (commit)
from b294c06c6cd6b5d55e015cc69c00c0c1f9b03494 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/bb5179f953319c1db7b98cc048d7635bd996eff4
commit bb5179f953319c1db7b98cc048d7635bd996eff4
Author: Oleg Broytman <ph...@ph...>
Date: Tue Mar 7 22:30:22 2017 +0300
Update docs: explain branch workflow
[skip ci]
diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
index 517bbcc..1b33cdd 100644
--- a/docs/DeveloperGuide.rst
+++ b/docs/DeveloperGuide.rst
@@ -104,6 +104,19 @@ converters. Another approach for ``from_python`` is to return an object
that has ``__sqlrepr__`` method. Such objects convert to SQL strings
themselves, converters are not used.
+Branch workflow
+===============
+
+Initially ``SQLObject`` was being developed using ``Subversion``. Even
+after switching to git development process somewhat preserves the old
+workflow.
+
+The ``trunk``, called ``master`` in git, is the most advanced and the
+most unstable branch. It is where new features are applied. Bug fixes
+are applied to ``oldstable`` and ``stable`` branches and are merged
+upward -- from ``oldstable`` to ``stable`` and from ``stable`` to
+``master``.
+
Style Guide
===========
-----------------------------------------------------------------------
Summary of changes:
docs/DeveloperGuide.rst | 13 +++++++++++++
1 file changed, 13 insertions(+)
hooks/post-receive
--
SQLObject development repository
|
