[debbugs-tracker] bug#33554: closed ([PATCH] gnu: Add git-imerge.)

[GNU bug Tracking System]

Your message dated Sun, 02 Dec 2018 23:33:57 +0100
with message-id <address@hidden>
and subject line Re: [bug#33554] [PATCH] gnu: Add git-imerge.
has caused the debbugs.gnu.org bug report #33554,
regarding [PATCH] gnu: Add git-imerge.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
33554: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33554
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: Add git-imerge.
>
>
>
>
> Date: 
>
> Thu, 29 Nov 2018 18:24:51 -0500
>
>
>
>
> * gnu/packages/version-control.scm (git-imerge): New variable.
> ---
>  gnu/packages/version-control.scm | 48 +++++++++++++++++++++++++++++++-
>  1 file changed, 47 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
> index cec3e5fc6c..d068c30735 100644
> --- a/gnu/packages/version-control.scm
> +++ b/gnu/packages/version-control.scm
> @@ -7,7 +7,7 @@
>  ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
>  ;;; Copyright © 2014, 2016 Eric Bavier <address@hidden>
>  ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
> -;;; Copyright © 2015 Kyle Meyer <address@hidden>
> +;;; Copyright © 2015, 2018 Kyle Meyer <address@hidden>
>  ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <address@hidden>
>  ;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>
>  ;;; Copyright © 2016, 2017, 2018 Nils Gillmann <address@hidden>
> @@ -2395,3 +2395,49 @@ used to keep a folder in sync between computers.")
>  given commit into the specified ref(s).  It has various options that control
>  how information about the merge is displayed.")
>        (license license:gpl2+))))
> +
> +(define-public git-imerge
> +  (package
> +    (name "git-imerge")
> +    (version "1.1.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://github.com/mhagger/git-imerge/archive/v";
> +                    version ".tar.gz"))
> +              (file-name (string-append name "-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0a6ay8fpgz3yd84jc40w41x0rcfpan6bcq4wd1hxiiqwb51jysb2"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:tests? #f  ; The are only manual test scripts.
> +       #:make-flags (list (string-append "DESTDIR=" %output)
> +                          "PREFIX=")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (delete 'configure)
> +         (add-before 'install 'patch-git
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (let ((git (string-append (assoc-ref inputs "git")
> +                                       "/bin/git")))
> +               (substitute* "git-imerge"
> +                 (("'git'") (string-append "'" git "'")))
> +               #t)))
> +         (add-after 'install 'wrap-script
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (wrap-program (string-append (assoc-ref outputs "out")
> +                                          "/bin/git-imerge")
> +               `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
> +             #t)))))
> +    (inputs
> +     `(("git" ,git)
> +       ("python" ,python-wrapper)))
> +    (home-page "https://github.com/mhagger/git-imerge";)
> +    (synopsis "Incremental merge for Git")
> +    (description "This Git extension defines a subcommand, @code{imerge},
> +which performs an incremental merge between two branches.  Its two primary
> +design goals are to reduce the pain of resolving merge conflicts by finding
> +the smallest possible conflicts and to allow a merge to be saved, tested,
> +interrupted, published, and collaborated on while in progress.")
> +    (license license:gpl2+)))
> -- 
> 2.19.2
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#33554] [PATCH] gnu: Add git-imerge.
>
>
>
>
> Date: 
>
> Sun, 02 Dec 2018 23:33:57 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)
>
>
>
>
> Hi,
>
> Kyle Meyer <address@hidden> skribis:
>
> > * gnu/packages/version-control.scm (git-imerge): New variable.
>
> Applied, thanks!
>
> Ludo’.
>
>
> --- End Message ---