X-Git-Url: https://vcs.fsf.org/?p=mharc.git;a=blobdiff_plain;f=README.FSF;h=5bd71b59e5057835a99a9daf039538de9441c46f;hp=5ae512cd72470f6315082f8d10ace23921929e4b;hb=5fd9929753d608ea69fe0b3a65c1aee572adfec1;hpb=190cf5a4dab970fa949a47f44d0f7a15ced0a6f6 diff --git a/README.FSF b/README.FSF index 5ae512c..5bd71b5 100644 --- a/README.FSF +++ b/README.FSF @@ -20,9 +20,18 @@ instead generated from the .in file by running make configure. Note, make configure must be run from /home/mharc (checkout into that directory on your local system). -The lists.fsf branch should be rebased to any changes from master, like this: +Ansible pulls a branch with the name of the current hostname, so lists.gnu.org +is an alias to master, and lists.dev.fsf.org is an alias to lists.fsf.org. +This was achieved by doing for example: -git checkout lists.fsf +vcs.fsf.org $ +sudo -i -u git +cd /home/git/repositories/mharc.git +git symbolic-ref refs/heads/lists.dev.fsf.org refs/heads/lists.fsf.org + +The lists.fsf.org branch should be rebased to any changes from master, like this: + +git checkout lists.fsf.org git rebase master # if there are merge conflicts, manually merge any .in files, then make configure @@ -35,7 +44,7 @@ Then on lists.fsf.org: su mharc cd git fetch -git reset --hard origin/lists.fsf +git reset --hard origin/lists.fsf.org To update existing lists headers, the only way namazu supports is to @@ -45,4 +54,4 @@ unique string into the header where the list name goes, copied it to for x in */NMZ.head; do sed "s/gachJefyeonJoa/${x%/*}/g" /tmp/NMZ.head>$x || { echo failed on $x; break; } ; done -This process can be repeated for more changes. \ No newline at end of file +This process can be repeated for more changes.