From naesten at gmail.com Sat Dec 28 00:22:30 2013 From: naesten at gmail.com (Samuel Bronson) Date: Fri, 27 Dec 2013 19:22:30 -0500 Subject: [Git-dpm-devel] [PATCH] Allow passing annotated tags to "-p" Message-ID: <1388190150-18780-1-git-send-email-naesten@gmail.com> --- git-dpm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-dpm.sh b/git-dpm.sh index 546ee1e..7aa17d7 100755 --- a/git-dpm.sh +++ b/git-dpm.sh @@ -4484,7 +4484,7 @@ function import_tar() { ##:function add_parent parents/inout parent_commits/inout p_commits/inout =gitcheck function add_parent() { local object - object="$(gitcmd rev-parse --verify "$1" || true)" + object="$(gitcmd rev-parse --verify "$1^{}" || true)" verify_commit "$1" "$object" || return 1 parents="$parents -p $object" parent_commits="$parent_commits $object" -- 1.8.5.1 From naesten at gmail.com Sat Dec 28 16:52:29 2013 From: naesten at gmail.com (Samuel Bronson) Date: Sat, 28 Dec 2013 11:52:29 -0500 Subject: [Git-dpm-devel] [PATCH 1/3] example of importing a simple git-buildpackage project Message-ID: <1388249551-15162-1-git-send-email-naesten@gmail.com> --- examples.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/examples.html b/examples.html index b79187d..3683ad4 100644 --- a/examples.html +++ b/examples.html @@ -21,6 +21,9 @@ ul { list-style-type: square; }
  • Switching to a new upstream version
  • Create a new project
  • Switching an existing project to git-dpm
  • +

    Adding a new patch

    @@ -326,3 +329,13 @@ show that is worked this time. So get rid of the temporary branch:

     git branch -d pre
     
    + +

    Simple git-buildpackage project

    + +

    +For a package that was using git-buildpackage in the +conventional way, with a debian branch named "master" and an upstream +branch named "upstream", it should suffice to simply do e.g.: +

    +git dpm init --patches-applied ../inform-mode_1.5.8.orig.tar.gz
    +
    -- 1.8.5.1 From naesten at gmail.com Sat Dec 28 16:52:30 2013 From: naesten at gmail.com (Samuel Bronson) Date: Sat, 28 Dec 2013 11:52:30 -0500 Subject: [Git-dpm-devel] [PATCH 2/3] Update webpage now that git-dpm is packaged In-Reply-To: <1388249551-15162-1-git-send-email-naesten@gmail.com> References: <1388249551-15162-1-git-send-email-naesten@gmail.com> Message-ID: <1388249551-15162-2-git-send-email-naesten@gmail.com> --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3ac60ed..348879f 100644 --- a/index.html +++ b/index.html @@ -157,7 +157,7 @@ usually be other changes to the files in debian/ necessary, which usually will be put in their own commits).

    Get git-dpm

    -Until there are debian packages, you can get it with: +It is available in the package git-dpm, or for the latest version you can do:
    git clone git://git.debian.org/git/git-dpm/git-dpm.git
    You just need the git-dpm.sh and you want want to look at the manpage git-dpm.1 and the examples.html. -- 1.8.5.1 From naesten at gmail.com Sat Dec 28 16:52:31 2013 From: naesten at gmail.com (Samuel Bronson) Date: Sat, 28 Dec 2013 11:52:31 -0500 Subject: [Git-dpm-devel] [PATCH 3/3] Some grammar fixes for the manpage In-Reply-To: <1388249551-15162-1-git-send-email-naesten@gmail.com> References: <1388249551-15162-1-git-send-email-naesten@gmail.com> Message-ID: <1388249551-15162-3-git-send-email-naesten@gmail.com> --- git-dpm.1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git-dpm.1 b/git-dpm.1 index 5797c3c..017d766 100644 --- a/git-dpm.1 +++ b/git-dpm.1 @@ -42,13 +42,13 @@ does not need to switch branches manually so often. .SH SHORT EXPLANATION OF THE BRANCHES .IP "the upstream branch (\fBupstream\fP|\fBupstream\-\fP\fIwhatever\fP)" This branch contains the upstream sources. -It contents need to be equal enough to the contents in your upstream tarball. +Its contents need to be equal enough to the contents in your upstream tarball. .IP "the patched branch (\fBpatched\fP|\fBpatched\-\fP\fIwhatever\fP)" This branch contains your patches to the upstream source. Every commit will be stored as a single patch in the resulting package. -Most of the time it will not exist as branch known to \fBgit\fP, +Most of the time it will not exist as a branch known to \fBgit\fP, but only as some point in the history of the Debian branch and possibly as tag for published versions. \fBGit\-dpm\fP will create it when needed and remove the @@ -260,7 +260,7 @@ Denote the Debian branch already has the patches applied. Without this git\-dpm will check there are no changes in the Debian branch outside patch management before applying the -patches but instead check there are no differences after +patches; with this, it will instead check there are no differences after applying the patches. .TP @@ -367,7 +367,7 @@ Options: .B \-\-amend Replace the commit currently the head of the Debian branch (\fBmaster\fP|\fIsomething\fP) instead of creating a new one on top. -The commit message will contain also include changes done to +The commit message will also include changes done to \fBdebian/changelog\fP in the previous commit (unless reverted by the new edit). -- 1.8.5.1