Attachment 126037 Details for Bug 169762 – file.diff

[patch] file.diff

file.diff (text/plain), 2.82 KB, created by Gleb Popov on 2012-07-10 12:40:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Popov

Created: 2012-07-10 12:40:09 UTC

Size: 2.82 KB

patch

obsolete

>diff -ruN /usr/ports/devel/tortoisehg2/Makefile ./Makefile
>--- /usr/ports/devel/tortoisehg2/Makefile	2012-06-01 09:17:57.000000000 +0400
>+++ ./Makefile	2012-07-10 14:23:00.700761554 +0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tortoisehg
>-PORTVERSION=	2.4
>+PORTVERSION=	2.4.2
> PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
>diff -ruN /usr/ports/devel/tortoisehg2/distinfo ./distinfo
>--- /usr/ports/devel/tortoisehg2/distinfo	2012-05-09 22:56:06.000000000 +0400
>+++ ./distinfo	2012-07-10 15:15:27.412766432 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (tortoisehg-2.4.tar.gz) = 117029ff1912b98c52cd89ebc6ee6aa5d4375bff67bbc1d2ee9f2bd636d06233
>-SIZE (tortoisehg-2.4.tar.gz) = 8978194
>+SHA256 (tortoisehg-2.4.2.tar.gz) = d30963453a9d618b04dfbfebda1641cb4742133829c25ff60735236f1399108a
>+SIZE (tortoisehg-2.4.2.tar.gz) = 9018020
>diff -ruN /usr/ports/devel/tortoisehg2/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports/devel/tortoisehg2/files/pkg-message.in	2011-09-04 14:06:11.000000000 +0400
>+++ ./files/pkg-message.in	2012-07-10 15:16:18.171763872 +0400
>@@ -1,4 +1,4 @@
> It is recommended to %include TortoiseHG's mergetools.rc into your ~/.hgrc file,
>-especially if you use textproc/kdiff3 as your merge tool.
>+especially if you use textproc/kdiff3 as your merge tool:
> 
> %include %%PREFIX%%/share/tortoisehg/mergetools.rc
>diff -ruN /usr/ports/devel/tortoisehg2/pkg-plist ./pkg-plist
>--- /usr/ports/devel/tortoisehg2/pkg-plist	2012-05-09 22:56:06.000000000 +0400
>+++ ./pkg-plist	2012-07-10 15:22:15.994762392 +0400
>@@ -321,9 +321,6 @@
> %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.py
> %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyc
> %%PYTHON_SITELIBDIR%%/tortoisehg/util/hglib.pyo
>-%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgshelve.py
>-%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgshelve.pyc
>-%%PYTHON_SITELIBDIR%%/tortoisehg/util/hgshelve.pyo
> %%PYTHON_SITELIBDIR%%/tortoisehg/util/hgversion.py
> %%PYTHON_SITELIBDIR%%/tortoisehg/util/hgversion.pyc
> %%PYTHON_SITELIBDIR%%/tortoisehg/util/hgversion.pyo
>@@ -545,6 +542,7 @@
> share/pixmaps/tortoisehg/icons/scalable/status/thg-file-p0.svg
> share/pixmaps/tortoisehg/icons/scalable/status/thg-file-p1.svg
> share/pixmaps/tortoisehg/icons/scalable/status/thg-git-subrepo.svg
>+share/pixmaps/tortoisehg/icons/scalable/status/thg-remote-repo.svg
> share/pixmaps/tortoisehg/icons/scalable/status/thg-subrepo.svg
> share/pixmaps/tortoisehg/icons/scalable/status/thg-success.svg
> share/pixmaps/tortoisehg/icons/scalable/status/thg-svn-subrepo.svg
>@@ -564,7 +562,6 @@
> share/pixmaps/tortoisehg/icons/svg/proxy.svg
> share/pixmaps/tortoisehg/icons/svg/recovery.svg
> share/pixmaps/tortoisehg/icons/svg/refresh_overlays.svg
>-share/pixmaps/tortoisehg/icons/svg/remote-repo.svg
> share/pixmaps/tortoisehg/icons/svg/remove.svg
> share/pixmaps/tortoisehg/icons/svg/repobrowse.svg
> share/pixmaps/tortoisehg/icons/svg/shelve.svg

Actions: View | Diff

Attachments on bug 169762: 126037