Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (cc77047114a1e553db5b2d7573382fdd35dfe5b3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (cc77047114a1e553db5b2d7573382fdd35dfe5b3)
  • Date: Fri, 21 Mar 2008 16:30:11 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

smgl/guru-tools/DETAILS | 2 +-
smgl/guru-tools/HISTORY | 5 +++++
smgl/guru-tools/smgl-cherry-pick | 5 +++++
3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit cc77047114a1e553db5b2d7573382fdd35dfe5b3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

smgl-cherry-pick: propagate the changes

commit 851f1b934ded761d91c82932797247193126b468
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

smgl-cherry-pick: warn about needing to be in the top dir

commit 78bd78d9c2799ae6726c73332011493627d5a731
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

smgl-cherry-pick: fixed omission of new files

diff --git a/smgl/guru-tools/DETAILS b/smgl/guru-tools/DETAILS
index b606dc1..8405dec 100755
--- a/smgl/guru-tools/DETAILS
+++ b/smgl/guru-tools/DETAILS
@@ -5,7 +5,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
SOURCE_URL[0]=http://download.sourcemage.org/distro/misc/$SOURCE

SOURCE_HASH=sha512:69ad77d49c3a9f1f58fff98792c624f8f5f55592a6346c9297e7ba05ff91a50433b7832fe8eccd31e18ce6a797d09a1cc420c779a2ebaf40d4e38846d3b67aa9
WEB_SITE=http://www.sourcemage.org
- PATCHLEVEL=1
+ PATCHLEVEL=2
ENTERED=20030602
LICENSE=GPL
KEYWORDS="smgl"
diff --git a/smgl/guru-tools/HISTORY b/smgl/guru-tools/HISTORY
index cf0307c..6a96e22 100644
--- a/smgl/guru-tools/HISTORY
+++ b/smgl/guru-tools/HISTORY
@@ -1,3 +1,8 @@
+2008-03-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * smgl-cherry-pick: fixed omission of new files
+ warn about needing to be in the top dir
+
2008-03-15 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: added missing $

diff --git a/smgl/guru-tools/smgl-cherry-pick
b/smgl/guru-tools/smgl-cherry-pick
index 7a3d1a0..52f19a9 100755
--- a/smgl/guru-tools/smgl-cherry-pick
+++ b/smgl/guru-tools/smgl-cherry-pick
@@ -7,6 +7,7 @@
rc=0
commit=$1
[[ -z $commit ]] && echo no commit specified && exit 100
+[[ -f ChangeLog ]] || { echo run me from the top dir; exit 99; }

# check if commit diff does not contain a HISTORY/ChangeLog header
# it also must contain diff changes (this enables merging of bins)
@@ -24,8 +25,10 @@ else
for diff in xx*; do
if ! grep -q "+++.*\(HISTORY\|ChangeLog\)" $diff; then
if ! grep -q "^Binary file" $diff; then
+ file=$(sed -n '/^+++ / s,^[^/]*/,,p' $diff)
patch -p1 < $diff
new_rc=$?
+ git add "$file"
[[ $rc == 0 ]] && rc=$new_rc
else
file=$(sed -n '/^diff --git/ { s,^[^/]*/,,; s, .*$,,p} ' $diff)
@@ -34,6 +37,7 @@ else
echo "Warning, nonexsitent file: $file"
else # new or updated file
git show $commit:"$file" > "$file"
+ git add "$file"
fi
fi
echo
@@ -81,6 +85,7 @@ else

cat $diff $file > $file.new
mv $file.new $file
+ git add $file # needed when cherrypicking new spells
echo
fi
done




Archive powered by MHonArc 2.6.24.

Top of Page