[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.12-5-g5fb038c

Antti-Juhani Kaijanaho ajk at debian.org
Wed Oct 31 22:15:12 UTC 2007


The branch, master has been updated
       via  5fb038ced56092add42712b1d113157fd4d2369d (commit)
      from  6ae63faa4c01293aa91c077590770638df6c7f49 (commit)


- Shortlog ------------------------------------------------------------
5fb038c Topic branches again

Summary of changes:
 debian/README |   16 +++-------------
 1 files changed, 3 insertions(+), 13 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 5fb038ced56092add42712b1d113157fd4d2369d
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Thu Nov 1 00:14:48 2007 +0200

    Topic branches again
    
    The old rules were a bad idea :(
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/README b/debian/README
index d181bd0..c900169 100644
--- a/debian/README
+++ b/debian/README
@@ -51,19 +51,9 @@ Rules of conduct for people with push access to the repository:
     least on the committer or merger's development machine; use topic
     branches for instable development.
 
-  - Topic branches in the collab-maint repository should be named
-    USERNAME/DESCRIPTIVE-NAME, where USERNAME is the Alioth username
-    of the user creating the topic branch, and DESCRIPTIVE-NAME is a
-    something descriptive to distinguish the branch from the user's
-    other topic branches.  A topic branch is owned by the user whose
-    username is encoded in the branch name.
-
-  - Topic branches may (and should) be rebased at will by the branch
-    owner while it hasn't been merged to any other public branch.  New
-    public branches should never be forked off a topic branch, and
-    only the owner of the branch should merge the branch to master
-    (after review, if possible).  A topic branch that is no longer
-    needed should be deleted.
+  - Topic branches should not be made public on the collab-maint
+    repository.  Instead, send patch sets to the list when you
+    want to publish.
 
   - Include an update of debian/changelog in your commits.  One-line
     summary of the commit is sufficient, as you can elaborate in the

-- 
Debian control file query tools



More information about the Dctrl-tools-devel mailing list