Mercurial > hg > soundsoftware-site

changeset 39:150ceac17a8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Add a couple of files missed in last update -- brings us properly up to SVN trunk rev 4411
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 19 Nov 2010 14:05:24 +0000
parents 94944d00e43c
children f9a09da91294 7f0e922c8982 af80e5618e9b 8661b858af72
files .svn/entries doc/.svn/entries doc/.svn/text-base/git.rdoc.svn-base doc/git.rdoc
diffstat 4 files changed, 90 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.svn/entries	Fri Nov 19 13:24:41 2010 +0000
+++ b/.svn/entries	Fri Nov 19 14:05:24 2010 +0000
@@ -69,9 +69,6 @@
 
 307
 
-extra
-dir
-
 README.rdoc
 file
 
@@ -106,6 +103,9 @@
 
 208
 
+extra
+dir
+
 db
 dir
 
@@ -121,6 +121,12 @@
 script
 dir
 
+doc
+dir
+
+config
+dir
+
 .gitignore
 file
 
@@ -155,12 +161,6 @@
 
 322
 
-config
-dir
-
-doc
-dir
-
 lib
 dir
 
--- a/doc/.svn/entries	Fri Nov 19 13:24:41 2010 +0000
+++ b/doc/.svn/entries	Fri Nov 19 14:05:24 2010 +0000
@@ -236,7 +236,7 @@
 
 
 
-2010-11-19T13:04:51.228963Z
+2010-11-19T14:03:48.248927Z
 cc77650493d11d18eabb058fbdf7ac24
 2010-10-22T17:18:11.628381Z
 4273
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/.svn/text-base/git.rdoc.svn-base	Fri Nov 19 14:05:24 2010 +0000
@@ -0,0 +1,40 @@
+= Contributing to Redmine with git and github
+
+(This is a beta document. If you can improve it, fork it and send a patch/pull request.)
+
+The official repository is at http://github.com/edavis10/redmine
+
+Official branches:
+
+* master - is automatically mirrored to svn trunk. DO NOT COMMIT OR MERGE INTO THIS BRANCH
+* [0.6, 0.7, 0.8, 0.9, 1.0,...]-stable - is automatically mirrored to svn release branches. DO NOT COMMIT OR MERGE INTO THIS BRANCH
+* integration-to-svn-trunk - this branch is a git-only branch that will track master (trunk). Any code in here will be eventually merged into master but it may be rebased as any time (git-svn needs to rebase to commit to svn)
+* integration-to-svn-stable-1.0 - this branch is a git-only branch that will track the 1.0-stable branch in svn.  Any code in here will be eventually merged into master and 1.0-stable but it may be rebased as any time (git-svn needs to rebase to commit to svn)
+
+I (edavis10) might have some other branches on the repository for work in progress.
+
+== Branch naming standards
+
+Redmine has two kinds of development:
+
+* bug fixes
+* new feature development
+
+Both bug fixes and new feature development should be done in a branch named after the issue number on Redmine.org.  So if you are fixing Issue #6244 your branch should be named:
+
+* 6244
+* 6244-sort-people-by-display-name (optional description)
+* issue/6244 (optional "issue" prefix)
+* issue/6244-sort-people-by-display-name (optional prefix and description)
+
+That way when the branch is merged into the Redmine core, the correct issue can be updated.
+
+Longer term feature development might require multiple branches.  Just your best judgment and try to keep the issue id in the name.
+
+If you don't have an issue for your patch, create an issue on redmine.org and say it's a placeholder issue for your work. Better yet, add a brief overview of what you are working on to the issue and you might get some help with it.
+
+== Coding Standards
+
+Follow the coding standards on the Redmine wiki: http://www.redmine.org/wiki/redmine/Coding_Standards#Commits.  Make sure you commit logs conform to the standards, otherwise someone else will have to rewrite them for you and you might lose attribution during the conversion to svn.
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/git.rdoc	Fri Nov 19 14:05:24 2010 +0000
@@ -0,0 +1,40 @@
+= Contributing to Redmine with git and github
+
+(This is a beta document. If you can improve it, fork it and send a patch/pull request.)
+
+The official repository is at http://github.com/edavis10/redmine
+
+Official branches:
+
+* master - is automatically mirrored to svn trunk. DO NOT COMMIT OR MERGE INTO THIS BRANCH
+* [0.6, 0.7, 0.8, 0.9, 1.0,...]-stable - is automatically mirrored to svn release branches. DO NOT COMMIT OR MERGE INTO THIS BRANCH
+* integration-to-svn-trunk - this branch is a git-only branch that will track master (trunk). Any code in here will be eventually merged into master but it may be rebased as any time (git-svn needs to rebase to commit to svn)
+* integration-to-svn-stable-1.0 - this branch is a git-only branch that will track the 1.0-stable branch in svn.  Any code in here will be eventually merged into master and 1.0-stable but it may be rebased as any time (git-svn needs to rebase to commit to svn)
+
+I (edavis10) might have some other branches on the repository for work in progress.
+
+== Branch naming standards
+
+Redmine has two kinds of development:
+
+* bug fixes
+* new feature development
+
+Both bug fixes and new feature development should be done in a branch named after the issue number on Redmine.org.  So if you are fixing Issue #6244 your branch should be named:
+
+* 6244
+* 6244-sort-people-by-display-name (optional description)
+* issue/6244 (optional "issue" prefix)
+* issue/6244-sort-people-by-display-name (optional prefix and description)
+
+That way when the branch is merged into the Redmine core, the correct issue can be updated.
+
+Longer term feature development might require multiple branches.  Just your best judgment and try to keep the issue id in the name.
+
+If you don't have an issue for your patch, create an issue on redmine.org and say it's a placeholder issue for your work. Better yet, add a brief overview of what you are working on to the issue and you might get some help with it.
+
+== Coding Standards
+
+Follow the coding standards on the Redmine wiki: http://www.redmine.org/wiki/redmine/Coding_Standards#Commits.  Make sure you commit logs conform to the standards, otherwise someone else will have to rewrite them for you and you might lose attribution during the conversion to svn.
+
+