diff options
author | Ryan Lortie <desrt@desrt.ca> | 2007-09-13 11:13:40 -0400 |
---|---|---|
committer | Ryan Lortie <desrt@desrt.ca> | 2007-09-13 11:13:40 -0400 |
commit | d34905d8115a187a8846da0d2c67eb3826a71a8e (patch) | |
tree | 60b993df8a3da2635e3e81e47504b2c8da4a6fb0 | |
parent | d4e511a724b3b81035beed0f8d3e4aff2d14e18a (diff) |
migrate from cvs to git (cvs2svn -> git-svnimport).
2007-09-13 Ryan Lortie <desrt@desrt.ca>
migrate from cvs to git (cvs2svn -> git-svnimport).
* HACKING: update release/branch/tag instructions
* */.cvsignore: rename to .gitignore
also, clean up tags and branch names to conform to HACKING
-rw-r--r-- | .gitignore (renamed from .cvsignore) | 0 | ||||
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | HACKING | 35 | ||||
-rw-r--r-- | bus/.gitignore (renamed from bus/.cvsignore) | 0 | ||||
-rw-r--r-- | dbus/.gitignore (renamed from dbus/.cvsignore) | 0 | ||||
-rw-r--r-- | doc/.gitignore (renamed from doc/.cvsignore) | 0 | ||||
-rw-r--r-- | glib/.cvsignore | 13 | ||||
-rw-r--r-- | test/.gitignore (renamed from test/.cvsignore) | 0 | ||||
-rw-r--r-- | test/data/valid-config-files/.gitignore (renamed from test/data/valid-config-files/.cvsignore) | 0 | ||||
-rw-r--r-- | test/data/valid-service-files/.gitignore (renamed from test/data/valid-service-files/.cvsignore) | 0 | ||||
-rw-r--r-- | test/glib/.cvsignore | 15 | ||||
-rw-r--r-- | test/name-test/.gitignore (renamed from test/name-test/.cvsignore) | 0 | ||||
-rw-r--r-- | tools/.gitignore (renamed from tools/.cvsignore) | 0 |
13 files changed, 27 insertions, 45 deletions
@@ -1,3 +1,12 @@ +2007-09-13 Ryan Lortie <desrt@desrt.ca> + + migrate from cvs to git (cvs2svn -> git-svnimport). + + * HACKING: update release/branch/tag instructions + * */.cvsignore: rename to .gitignore + + also, clean up tags and branch names to conform to HACKING + 2007-08-17 William Jon McCann <mccann@jhu.edu> * update-dbus-docs.sh: upload DTD to server @@ -76,28 +76,29 @@ To make a release of D-Bus, do the following: - add a ChangeLog entry containing the version number you're releasing ("Released 0.3" or something) so people can see which changes were before and after - a given release. + a given release - - The version number should have major.minor.micro even + - the version number should have major.minor.micro even if micro is 0, i.e. "1.0.0" and "1.2.0" not "1.0"/"1.2" - "make distcheck" (DO NOT just "make dist" - pass the check!) - if make distcheck fails, fix it. - - once distcheck succeeds, "cvs commit" + - once distcheck succeeds, "git-commit -a". This is the version + of the tree that corresponds exactly to the released tarball. - - if someone else made changes and the commit fails, - you have to "cvs up" and run "make distcheck" again - - - once the commit succeeds, "cvs tag DBUS_X_Y_Z" where - X_Y_Z map to version X.Y.Z + - tag the tree with "git-tag -s -m 'Released X.Y.Z' dbus-X.Y.Z" + where X.Y.Z is the version of the release. If you can't sign + then simply created an unannotated tag: "git-tag dbus-X.Y.Z". - bump the version number up in configure.in, and commit it. Make sure you do this *after* tagging the previous - release! The idea is that CVS has a newer version number + release! The idea is that git has a newer version number than anything released. + - push your changes to the central repository + - scp your tarball to freedesktop.org server and copy it to /srv/dbus.freedesktop.org/www/releases/dbus. This should be possible if you're in group "dbus" @@ -118,7 +119,7 @@ To make a release of D-Bus, do the following: After making a ".0" stable release === -After releasing, when you increment the version number in CVS, also +After releasing, when you increment the version number in git, also move the ChangeLog to ChangeLog.pre-X-Y where X-Y is what you just released, e.g. ChangeLog.pre-1-0. Then create and cvs add a new empty ChangeLog. The last entry in ChangeLog.pre-1-0 should be the one about @@ -131,16 +132,16 @@ not done immediately, instead it's possible to wait until someone has a not-suitable-for-stable change they want to make and then branch to allow committing that change. -The branch name should be DBUS_X_Y_BRANCH which is a branch that has +The branch name should be dbus-X.Y-branch which is a branch that has releases versioned X.Y.Z -To branch, tag HEAD with DBUS_X_Y_BRANCHPOINT: - cvs tag DBUS_X_Y_BRANCHPOINT -then create the branch from that tag: - cvs rtag -b -r DBUS_X_Y_BRANCHPOINT DBUS_X_Y_BRANCH dbus +To branch, add a tag to the common ancestor: + git tag dbus-X.Y-branchpoint +then create the branch: + git branch dbus-X.Y-branch -Note that DBUS_X_Y_BRANCHPOINT may not tag the same revision as the -DBUS_X_Y_0 release, since we may not branch immediately. +Note that dbus-X.Y-branchpoint may not tag the same revision as the +dbus-X.Y.0 release, since we may not branch immediately. Environment variables === diff --git a/bus/.cvsignore b/bus/.gitignore index 21817b8e..21817b8e 100644 --- a/bus/.cvsignore +++ b/bus/.gitignore diff --git a/dbus/.cvsignore b/dbus/.gitignore index 51cd09cb..51cd09cb 100644 --- a/dbus/.cvsignore +++ b/dbus/.gitignore diff --git a/doc/.cvsignore b/doc/.gitignore index 3430689c..3430689c 100644 --- a/doc/.cvsignore +++ b/doc/.gitignore diff --git a/glib/.cvsignore b/glib/.cvsignore deleted file mode 100644 index 91ea2461..00000000 --- a/glib/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -*.la -dbus-glib-test -dbus-binding-tool -dbus-glib-error-switch.h -*.bb -*.bbg -*.da -*.gcov diff --git a/test/.cvsignore b/test/.gitignore index f7a65876..f7a65876 100644 --- a/test/.cvsignore +++ b/test/.gitignore diff --git a/test/data/valid-config-files/.cvsignore b/test/data/valid-config-files/.gitignore index a38e9d15..a38e9d15 100644 --- a/test/data/valid-config-files/.cvsignore +++ b/test/data/valid-config-files/.gitignore diff --git a/test/data/valid-service-files/.cvsignore b/test/data/valid-service-files/.gitignore index b6f2adcf..b6f2adcf 100644 --- a/test/data/valid-service-files/.cvsignore +++ b/test/data/valid-service-files/.gitignore diff --git a/test/glib/.cvsignore b/test/glib/.cvsignore deleted file mode 100644 index a0cd5e95..00000000 --- a/test/glib/.cvsignore +++ /dev/null @@ -1,15 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -test-dbus-glib -test-profile -test-service-glib -test-thread-client -test-thread-server -run-test.conf -test-service-glib-bindings.h -test-service-glib-glue.h -run-with-tmp-session-bus.conf -my-object-marshal.h -my-object-marshal.c diff --git a/test/name-test/.cvsignore b/test/name-test/.gitignore index 91eb1830..91eb1830 100644 --- a/test/name-test/.cvsignore +++ b/test/name-test/.gitignore diff --git a/tools/.cvsignore b/tools/.gitignore index 234cef96..234cef96 100644 --- a/tools/.cvsignore +++ b/tools/.gitignore |