From d34905d8115a187a8846da0d2c67eb3826a71a8e Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Thu, 13 Sep 2007 11:13:40 -0400 Subject: migrate from cvs to git (cvs2svn -> git-svnimport). 2007-09-13 Ryan Lortie 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 --- .cvsignore | 22 -------------------- .gitignore | 22 ++++++++++++++++++++ ChangeLog | 9 ++++++++ HACKING | 35 ++++++++++++++++---------------- bus/.cvsignore | 19 ----------------- bus/.gitignore | 19 +++++++++++++++++ dbus/.cvsignore | 16 --------------- dbus/.gitignore | 16 +++++++++++++++ doc/.cvsignore | 12 ----------- doc/.gitignore | 12 +++++++++++ glib/.cvsignore | 13 ------------ test/.cvsignore | 25 ----------------------- test/.gitignore | 25 +++++++++++++++++++++++ test/data/valid-config-files/.cvsignore | 5 ----- test/data/valid-config-files/.gitignore | 5 +++++ test/data/valid-service-files/.cvsignore | 6 ------ test/data/valid-service-files/.gitignore | 6 ++++++ test/glib/.cvsignore | 15 -------------- test/name-test/.cvsignore | 7 ------- test/name-test/.gitignore | 7 +++++++ tools/.cvsignore | 20 ------------------ tools/.gitignore | 20 ++++++++++++++++++ 22 files changed, 159 insertions(+), 177 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 bus/.cvsignore create mode 100644 bus/.gitignore delete mode 100644 dbus/.cvsignore create mode 100644 dbus/.gitignore delete mode 100644 doc/.cvsignore create mode 100644 doc/.gitignore delete mode 100644 glib/.cvsignore delete mode 100644 test/.cvsignore create mode 100644 test/.gitignore delete mode 100644 test/data/valid-config-files/.cvsignore create mode 100644 test/data/valid-config-files/.gitignore delete mode 100644 test/data/valid-service-files/.cvsignore create mode 100644 test/data/valid-service-files/.gitignore delete mode 100644 test/glib/.cvsignore delete mode 100644 test/name-test/.cvsignore create mode 100644 test/name-test/.gitignore delete mode 100644 tools/.cvsignore create mode 100644 tools/.gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index f36c2ddf..00000000 --- a/.cvsignore +++ /dev/null @@ -1,22 +0,0 @@ -config.log -config.status -config.sub -configure -*.pc -libtool -ltmain.sh -stamp-h1 -stamp-h -stamp-h.in -Doxyfile -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -config.guess -config.h -config.h.in -*.bb -*.bbg -*.da -*.gcov diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f36c2ddf --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +config.log +config.status +config.sub +configure +*.pc +libtool +ltmain.sh +stamp-h1 +stamp-h +stamp-h.in +Doxyfile +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.guess +config.h +config.h.in +*.bb +*.bbg +*.da +*.gcov diff --git a/ChangeLog b/ChangeLog index 08408d3b..7d3a3373 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-09-13 Ryan Lortie + + 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 * update-dbus-docs.sh: upload DTD to server diff --git a/HACKING b/HACKING index c5e05e7c..9de5955f 100644 --- a/HACKING +++ b/HACKING @@ -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/.cvsignore deleted file mode 100644 index 21817b8e..00000000 --- a/bus/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -*.la -dbus-daemon -dbus-daemon-activation-helper -dbus-daemon-activation-helper-test -*.bb -*.bbg -*.da -*.gcov -bus-test -rc.messagebus -messagebus -session.conf -system.conf -dbus-daemon.1 diff --git a/bus/.gitignore b/bus/.gitignore new file mode 100644 index 00000000..21817b8e --- /dev/null +++ b/bus/.gitignore @@ -0,0 +1,19 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +*.la +dbus-daemon +dbus-daemon-activation-helper +dbus-daemon-activation-helper-test +*.bb +*.bbg +*.da +*.gcov +bus-test +rc.messagebus +messagebus +session.conf +system.conf +dbus-daemon.1 diff --git a/dbus/.cvsignore b/dbus/.cvsignore deleted file mode 100644 index 51cd09cb..00000000 --- a/dbus/.cvsignore +++ /dev/null @@ -1,16 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -*.la -dbus-test -*.bb -*.bbg -*.gcov -*.da -dbus-arch-deps.h -.dbus-keyrings -dbus-glib-error-enum.h -*.gcno -*.gcda diff --git a/dbus/.gitignore b/dbus/.gitignore new file mode 100644 index 00000000..51cd09cb --- /dev/null +++ b/dbus/.gitignore @@ -0,0 +1,16 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +*.la +dbus-test +*.bb +*.bbg +*.gcov +*.da +dbus-arch-deps.h +.dbus-keyrings +dbus-glib-error-enum.h +*.gcno +*.gcda diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index 3430689c..00000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -*.la -*.o -api -dbus-specification.html -dbus-test-plan.html -dbus-tutorial.html -dbus-faq.html diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000..3430689c --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,12 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +*.la +*.o +api +dbus-specification.html +dbus-test-plan.html +dbus-tutorial.html +dbus-faq.html 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/.cvsignore deleted file mode 100644 index f7a65876..00000000 --- a/test/.cvsignore +++ /dev/null @@ -1,25 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -*.la -*.o -echo-server -echo-client -bus-test -unbase64 -*.bb -*.bbg -*.da -*.gcov -break-loader -spawn-test -test-exit -test-segfault -test-service -test-sleep-forever -decode-gcov -shell-test -test-shell-service -test-names diff --git a/test/.gitignore b/test/.gitignore new file mode 100644 index 00000000..f7a65876 --- /dev/null +++ b/test/.gitignore @@ -0,0 +1,25 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +*.la +*.o +echo-server +echo-client +bus-test +unbase64 +*.bb +*.bbg +*.da +*.gcov +break-loader +spawn-test +test-exit +test-segfault +test-service +test-sleep-forever +decode-gcov +shell-test +test-shell-service +test-names diff --git a/test/data/valid-config-files/.cvsignore b/test/data/valid-config-files/.cvsignore deleted file mode 100644 index a38e9d15..00000000 --- a/test/data/valid-config-files/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -debug-allow-all.conf -debug-allow-all-sha1.conf -session.conf -system.conf -run-with-tmp-session-bus.conf diff --git a/test/data/valid-config-files/.gitignore b/test/data/valid-config-files/.gitignore new file mode 100644 index 00000000..a38e9d15 --- /dev/null +++ b/test/data/valid-config-files/.gitignore @@ -0,0 +1,5 @@ +debug-allow-all.conf +debug-allow-all-sha1.conf +session.conf +system.conf +run-with-tmp-session-bus.conf diff --git a/test/data/valid-service-files/.cvsignore b/test/data/valid-service-files/.cvsignore deleted file mode 100644 index b6f2adcf..00000000 --- a/test/data/valid-service-files/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -debug-echo.service -debug-glib.service -debug-python.service -debug-segfault.service -debug-shell-echo-fail.service -debug-shell-echo-success.service diff --git a/test/data/valid-service-files/.gitignore b/test/data/valid-service-files/.gitignore new file mode 100644 index 00000000..b6f2adcf --- /dev/null +++ b/test/data/valid-service-files/.gitignore @@ -0,0 +1,6 @@ +debug-echo.service +debug-glib.service +debug-python.service +debug-segfault.service +debug-shell-echo-fail.service +debug-shell-echo-success.service 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/.cvsignore deleted file mode 100644 index 91eb1830..00000000 --- a/test/name-test/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -test-names -test-pending-call-dispatch -test-threads-init diff --git a/test/name-test/.gitignore b/test/name-test/.gitignore new file mode 100644 index 00000000..91eb1830 --- /dev/null +++ b/test/name-test/.gitignore @@ -0,0 +1,7 @@ +.deps +.libs +Makefile +Makefile.in +test-names +test-pending-call-dispatch +test-threads-init diff --git a/tools/.cvsignore b/tools/.cvsignore deleted file mode 100644 index 234cef96..00000000 --- a/tools/.cvsignore +++ /dev/null @@ -1,20 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -*.la -dbus-send -dbus-monitor -dbus-cleanup-sockets -dbus-launch -dbus-uuidgen -*.bb -*.bbg -*.gcov -*.da -dbus-viewer -dbus-glib-bindings.h -run-with-tmp-session-bus.conf -print-introspect -dbus-bus-introspect.xml diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 00000000..234cef96 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1,20 @@ +.deps +.libs +Makefile +Makefile.in +*.lo +*.la +dbus-send +dbus-monitor +dbus-cleanup-sockets +dbus-launch +dbus-uuidgen +*.bb +*.bbg +*.gcov +*.da +dbus-viewer +dbus-glib-bindings.h +run-with-tmp-session-bus.conf +print-introspect +dbus-bus-introspect.xml -- cgit