[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#920810: marked as done (ITP: imediff -- interactive full screen 2/3-way merge tool)

Your message dated Mon, 04 Feb 2019 03:02:47 +0000
with message-id <E1gqUX1-0009at-8Y@fasolo.debian.org>
and subject line Bug#920810: fixed in imediff 2.0-1
has caused the Debian Bug report #920810,
regarding ITP: imediff -- interactive full screen 2/3-way merge tool
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
920810: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=920810
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: wnpp
Severity: wishlist
Owner: Osamu Aoki <osamu@debian.org>


* Package name    : imediff
  Version         : 2.0
  Upstream Author : Osamu Aoki <osamu@debian.org>
* URL             : https://github.com/osamuaoki/imediff
* License         : GPL 2+
  Programming Lang: Python3, shell
  Description     : interactive full screen 2/3-way merge tool
    The imediff command helps you to merge 2 slightly different files with an
    optional base file interactively using the in-place alternating display of
    the changed content on a single-pane full screen terminal user interface.
    .
    The advantage of this user interface is the minimal movement of the line of
    sight for the user.  Other great tools such as vimdiff, xxdiff, meld and
    kdiff3 require you to look at different points of display to find the exact
    position of changes.  This makes imediff the most stress-free tool.
    .
    Other great tools for merge such as "diff3 -m ..." and "git merge ..."
    operate only on the difference by line.  So even for the non-overlapping
    changes, they yield the merge conflict if changes happen on the same line.
    .
    The automatic merge logic of the imediff command operates not only on the
    difference by line but on the difference by character.  This is another
    great feature of the imediff command. So for the non-overlapping changes, it
    always yields the clean merge.
    .
    This comes with git-ime script which helps you to split squished git commit
    using imediff and with a support script to use imediff as the backend of
    git-mergetool.


  Old upstream: 2003-2004 Jarno Elonen <elonen@iki.fi> in python2
  New upstream: 2015-2018 Osamu Aoki <osamu@debian.org> in python3

The old upstream agreed to handover maintenance to me.
This prompted osamu to port code to python3 etc. and
changed its name from imediff2 to imediff since it now supports
diff3.

This ITP is for uploading the new version 2.0 series (imediff).

Osamu

--- End Message ---
--- Begin Message --- 
Source: imediff
Source-Version: 2.0-1

We believe that the bug you reported is fixed in the latest version of
imediff, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 920810@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Osamu Aoki <osamu@debian.org> (supplier of updated imediff package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Wed, 30 Jan 2019 00:01:23 +0900
Source: imediff
Binary: imediff
Architecture: source all
Version: 2.0-1
Distribution: unstable
Urgency: medium
Maintainer: Osamu Aoki <osamu@debian.org>
Changed-By: Osamu Aoki <osamu@debian.org>
Description:
 imediff    - interactive full screen 2/3-way merge tool
Closes: 920810
Changes:
 imediff (2.0-1) unstable; urgency=medium
 .
   * New upstream release in python3 with diff3 support etc. as imediff.
     Closes: #920810
   * Add autopkgtest support.
Checksums-Sha1:
 4068b3c600fbd802cf78a1989d0dbf200fcb98a3 1905 imediff_2.0-1.dsc
 b6e322502058bc45d5bc1c4a02eaeefb7e18fd79 36428 imediff_2.0.orig.tar.xz
 28e2da06820fcbb161f4d4ea804ccd86d6074d8e 3692 imediff_2.0-1.debian.tar.xz
 56afb6b0db4a0b07c36b7dbe5ae4ab7d55474346 33616 imediff_2.0-1_all.deb
 be1c45fe044d2d16005bda3c24ca847e841a8c25 7040 imediff_2.0-1_amd64.buildinfo
Checksums-Sha256:
 efbda6eca529666eea8165ebb31e7ee622ce4c747055f5d8aa44ca719893a43f 1905 imediff_2.0-1.dsc
 faa92e25676a8d1ab96dd2b43019704e2a8c0004314aa1b0f7480e984df34762 36428 imediff_2.0.orig.tar.xz
 d75ae4f4c29cde14b3c480c3d51a16f78f38d39eeb5be350eff90eed8902d0e1 3692 imediff_2.0-1.debian.tar.xz
 2d63e6da6c6d21c09f883e2098dd06a1ddfd64fd0572032e920cb4e942802487 33616 imediff_2.0-1_all.deb
 00d3f273455be4f5851b860bc99b2fd228b69db7f564477f93d96e96fb1e749c 7040 imediff_2.0-1_amd64.buildinfo
Files:
 102f16f77ce40c72b2916d260d4066e2 1905 text optional imediff_2.0-1.dsc
 7a17dadfbb5e9b19391660a8443cde50 36428 text optional imediff_2.0.orig.tar.xz
 0b1c8e3b651f4d9c3456855a9c31e018 3692 text optional imediff_2.0-1.debian.tar.xz
 e91d8f8d9819f3e5f094e99e192bc63a 33616 text optional imediff_2.0-1_all.deb
 d226d96e2e3863cf8d8a578176b399db 7040 text optional imediff_2.0-1_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEMTNyTWIHiBV56V1iHhNWiB3Y15EFAlxQbBEACgkQHhNWiB3Y
15EmFg/+K+un7pkSWup0hpZZXXX+ralCv6LIOzJCBaWHCkwJ8B7J+SXGU5EaYN1L
qQNez1OHdN9iFO9ckE1rMJfreRaQJ6qZkNKXqPVl99EkffZWLhup2ZwKJY9bpCCG
+9wleRe8StR74hAOAAkB79enFzd5kiv/+jiMQ8MFp8EuRDKMsp3nuFphf9xREEAe
i4jt+6jUahaasY1Tv3PVznPmETlU51TxKbtULZHXHhvsZnHLSWBZ+I5k2+Af8bJy
e1Fi8N6BdowosrOSoZQ2KI4BNgGEK4P/xImOODXKULxV3U5VLUH8fGLcbYDfAgej
pY/194Lj50Rh/18le9PZZGk0rPGFsMQKjMdISg1JKosKJNGObpEMmVJcwZXbBRd6
0u3AHaCo3WvKRw64jeUg+Gf6ltxER+U1N0WFKnttLX20v32OQWsVWHxmJhJNHRYA
gXJN2ZAdU2FFI4sZ7ZU6zkMWORiCSfWCe64Qe/kuZ1/UBGcZM6sGLo88g8KNA/Oq
UWi6jKlPEc5nfGhji8Im6GPlAI27Ke28Vw3eovuqg0pjJ4Qb+4fIIREKSrTmay/k
rNUZ1ommtyNvT3i10vFwRoXc+jRM39YXselFCv9naC+CpiXqsZY6523t7ZP0ylQ9
HBagBP2zFLKIu1Rm7Q23394fGcSsLu/X3M0ivp2TwStC2uLZ964=
=0x8m
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: