diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-10-29 20:21:33 +0100 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-10-29 20:21:33 +0100 |
| commit | 062ce249617d9596b574e110d26fabd466afad1a (patch) | |
| tree | e7177be1a3c86d0d91330501899a808ab02c2e9b /HACKING | |
| parent | 0f282a1d6ef2e2698ee553a520e7f44f1b7b524f (diff) | |
| download | automake-062ce249617d9596b574e110d26fabd466afad1a.tar.gz | |
Move to git as primary source repository.
* Makefile.am (git-dist, git-release): Renamed and adjusted from ...
(cvs-dist, cvs-release): ... these.
(git-diff): New target, taken and adjusted from cvs-diff.
* Makefile.in: Regenerate.
* bootstrap: Adjust.
* NEWS: Announce change.
* doc/automake.texi (General Operation): cvs-dist is git-dist now.
(Timeline): Mention change.
Diffstat (limited to 'HACKING')
| -rw-r--r-- | HACKING | 22 |
1 files changed, 17 insertions, 5 deletions
@@ -89,7 +89,7 @@ ================================================================ -= Working with CVS += Working with git/CVS * To regenerate dependent files created by aclocal and automake, use the `bootstrap' script. It uses the code from the source @@ -98,9 +98,19 @@ automake and use it to generate those files. * Dependent files aclocal.m4, configure and Makefile.in in all - directories should be up to date in the CVS repository, so that + directories should be up to date in the git repository, so that the changes in them can be easily noticed and analyzed. +* Avoid merge commits on the master branch of the public git repository. + For unpublished changes in your development tree, it's easiest to + rebase against the current master before applying them, this preserves + a linear history. + +* For changes to appear in more than one branch, apply them to the + master branch and then cherry-pick them to the stable branch from + master if possible. This keeps the master uncluttered and preserves + meta-data on the stable branches. + ================================================================ = Test suite @@ -128,11 +138,13 @@ * Run ./bootstrap, ./configure, make. -* Run `make cvs-release'. +* NOTE: the next step has not been tested yet with git, so be careful. + +* Run `make git-release'. This will run distcheck to create the tarballs, commit the last NEWS/configure.ac/ChangeLog changes, tag the repository, sign the tarballs, and upload them. - Use `make GNUPLOADFLAGS="--user key" cvs-release' to sign with + Use `make GNUPLOADFLAGS="--user key" git-release' to sign with a non-default key. * Update version number in configure.ac to next alpha number. @@ -144,7 +156,7 @@ ----- -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2003, 2007 Free Software Foundation, Inc. This file is part of GNU Automake. |