Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3a2caf4429cd68c96b9102ba9b565e538e65a35b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3a2caf4429cd68c96b9102ba9b565e538e65a35b)
  • Date: Tue, 9 Dec 2014 20:05:41 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

ChangeLog | 6 ++++++
devel/cvs-fast-export/BUILD | 1 +
devel/cvs-fast-export/DEPENDS | 2 ++
devel/cvs-fast-export/DETAILS | 20 ++++++++++++++++++++
devel/cvs-fast-export/HISTORY | 2 ++
devel/git-imerge/BUILD | 1 +
devel/git-imerge/DETAILS | 25 +++++++++++++++++++++++++
devel/git-imerge/HISTORY | 2 ++
devel/git-imerge/INSTALL | 1 +
devel/git-imerge/PREPARE | 2 ++
10 files changed, 62 insertions(+)

New commits:
commit 3a2caf4429cd68c96b9102ba9b565e538e65a35b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

git-imerge: new spell, Incremental merge and rebase for git

commit d7d8c10b44eda95f822fea6e81341e5ac318d7e4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cvs-fast-export: new spell, Export an RCS or CVS history as a fast-import
stream

diff --git a/ChangeLog b/ChangeLog
index 7bcb206..8ac8fc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-09 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/cvs-fast-export: new spell, Export an RCS or CVS history as
+ a fast-import stream
+ * devel/git-imerge: new spell, Incremental merge and rebase for
+ git
+
2014-12-07 Ismael Luceno <ismael AT sourcemage.org>
* devel/reposurgeon: new spell, A tool for editing version-control
repository history
diff --git a/devel/cvs-fast-export/BUILD b/devel/cvs-fast-export/BUILD
new file mode 100755
index 0000000..429933c
--- /dev/null
+++ b/devel/cvs-fast-export/BUILD
@@ -0,0 +1 @@
+make CFLAGS="$CFLAGS"
diff --git a/devel/cvs-fast-export/DEPENDS b/devel/cvs-fast-export/DEPENDS
new file mode 100755
index 0000000..daaf3cb
--- /dev/null
+++ b/devel/cvs-fast-export/DEPENDS
@@ -0,0 +1,2 @@
+depends docbook-xsl &&
+depends xmlto
diff --git a/devel/cvs-fast-export/DETAILS b/devel/cvs-fast-export/DETAILS
new file mode 100755
index 0000000..015f543
--- /dev/null
+++ b/devel/cvs-fast-export/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=cvs-fast-export
+ VERSION=1.27
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.catb.org/~esr/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:401fa8206d60459d9ca4268ab0fb863542c26ee22b69b964008c83f1daac535d6d89172c7781f096ca7e36a263a2bb6d06055eafcd0500c8424ff1de5b41f2ab
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.catb.org/~esr/cvs-fast-export/";
+ LICENSE[0]="GPLv2"
+ ENTERED=20141209
+ KEYWORDS=""
+ SHORT="Export an RCS or CVS history as a fast-import stream"
+cat << EOF
+This program analyzes a collection of RCS files in a CVS repository (or
+outside of one) and, when possible, emits an equivalent history in the form
+of a fast-import stream. Not all possible histories can be rendered this
+way; the program tries to emit useful warnings when it can't. The program
+can also produce a visualization of the resulting commit DAG in the DOT
+format handled by the graphviz suite. The package also includes cvssync,
+a tool for mirroring masters from remote CVS hosts.
+EOF
diff --git a/devel/cvs-fast-export/HISTORY b/devel/cvs-fast-export/HISTORY
new file mode 100644
index 0000000..1a75447
--- /dev/null
+++ b/devel/cvs-fast-export/HISTORY
@@ -0,0 +1,2 @@
+2014-12-09 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: spell created
diff --git a/devel/git-imerge/BUILD b/devel/git-imerge/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/devel/git-imerge/BUILD
@@ -0,0 +1 @@
+make
diff --git a/devel/git-imerge/DETAILS b/devel/git-imerge/DETAILS
new file mode 100755
index 0000000..a84163c
--- /dev/null
+++ b/devel/git-imerge/DETAILS
@@ -0,0 +1,25 @@
+. "$GRIMOIRE/FUNCTIONS"
+ SPELL=git-imerge
+ VERSION=$(get_scm_version)
+ SOURCE="$SPELL-git.tar.bz2"
+ SOURCE_URL[0]="git://github.com/mhagger/$SPELL.git"
+ SOURCE_IGNORE=volatile
+ SOURCE_DOWNLOAD=on
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+ WEB_SITE="http://github.com/mhagger/git-imerge";
+ LICENSE[0]="GPLv2+"
+ ENTERED=20141209
+ KEYWORDS=""
+ SHORT="Incremental merge and rebase for git"
+cat << EOF
+Perform a merge between two branches incrementally. If conflicts are
+encountered, figure out exactly which pairs of commits conflict, and present
+the user with one pairwise conflict at a time for resolution.
+
+git-imerge has two primary design goals:
+
+Reduce the pain of resolving merge conflicts to its unavoidable minimum,
+by finding and presenting the smallest possible conflicts: those between the
+changes introduced by one commit from each branch. Allow a merge to be
saved,
+tested, interrupted, published, and collaborated on while it is in progress.
+EOF
diff --git a/devel/git-imerge/HISTORY b/devel/git-imerge/HISTORY
new file mode 100644
index 0000000..dcd2ae1
--- /dev/null
+++ b/devel/git-imerge/HISTORY
@@ -0,0 +1,2 @@
+2014-12-09 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL, PREPARE: spell created
diff --git a/devel/git-imerge/INSTALL b/devel/git-imerge/INSTALL
new file mode 100755
index 0000000..7bf1215
--- /dev/null
+++ b/devel/git-imerge/INSTALL
@@ -0,0 +1 @@
+make PREFIX="$INSTALL_ROOT/usr" install
diff --git a/devel/git-imerge/PREPARE b/devel/git-imerge/PREPARE
new file mode 100755
index 0000000..f8b7d7e
--- /dev/null
+++ b/devel/git-imerge/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (3a2caf4429cd68c96b9102ba9b565e538e65a35b), Ismael Luceno, 12/09/2014

Archive powered by MHonArc 2.6.24.

Top of Page