[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: Make a pause after each pull, to fix merging issues
From: |
Samuel Thibault |
Subject: |
[hurd] 01/01: Make a pause after each pull, to fix merging issues |
Date: |
Thu, 06 Feb 2014 00:30:37 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch README
in repository hurd.
commit 533655ebf8bc2dd16ce1966ab29f5a928c725b89
Author: Samuel Thibault <address@hidden>
Date: Thu Feb 6 01:30:21 2014 +0100
Make a pause after each pull, to fix merging issues
---
README | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/README b/README
index 2ecc745..9811086 100644
--- a/README
+++ b/README
@@ -12,6 +12,7 @@ git pull incubator dde:dde-upstream
git checkout dde
git pull . dde-upstream
+
# Remove files added outside DDE
git push incubator dde:dde-debian
git tag -m "New upstream snapshot" -a upstream/dde/$version.git$date
@@ -22,6 +23,7 @@ done
git checkout eth
git pull . dde-upstream
+
# Remove files added outside eth-*
git tag -m "New upstream snapshot" -a upstream/eth/$version.git$date
for dir in eth-filter eth-multiplexer
@@ -31,16 +33,19 @@ done
git checkout random
git pull incubator random
+
git tag -m "New upstream snapshot" -a upstream/random/$version.git$date
git archive --prefix=random/ HEAD | bzip2 >
../hurd_$version.git$date.orig-random.tar.bz2
git checkout procfs-jkoenig
git pull procfs master:procfs-jkoenig
+
git tag -m "New upstream snapshot" -a upstream/procfs/$version.git$date
git archive --prefix=procfs/ HEAD | bzip2 >
../hurd_$version.git$date.orig-procfs.tar.bz2
git checkout upstream
git pull upstream master:upstream
+
git tag -m "New upstream snapshot" -a upstream/hurd/$version.git$date
git archive --prefix=hurd-$version.git$date/ HEAD | bzip2 >
../hurd_$version.git$date.orig.tar.bz2
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git