On Fri Dec 26, 2025 at 10:26 PM PST, Greg Steuck wrote:
> I don't know if anybody uses it, but not carrying patches which are
> availble in the newest upstream sounds good.
> Test? OK?

I use darcs daily, thanks for the patch. However, I can't get this 002 patch to 
apply cleanly to latest snapshot. I probably ran the patch incorrectly.

patch < 0002-Update-darcs-to-2.18.5-on-longer-needs-patches.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From 24a8d7c7c94db52938ef277f2994c9b2a8a76b36 Mon Sep 17 00:00:00 2001
|From: Greg Steuck <[email protected]>
|Date: Fri, 26 Dec 2025 22:03:32 -0800
|Subject: [PATCH 2/2] Update darcs to 2.18.5, on longer needs patches
|
|---
| devel/darcs/Makefile                          | 200 +++----
| devel/darcs/distinfo                          | 554 +++++++++---------
| devel/darcs/patches/patch-darcs_cabal         |  30 -
| .../patches/patch-src_Darcs_Patch_Annotate_hs |  13 -
| .../patch-src_Darcs_Patch_Index_Monad_hs      |  11 -
| .../patch-src_Darcs_UI_Commands_Log_hs        |  11 -
| .../patches/patch-src_Darcs_Util_Compat_hs    |  23 -
| .../patch-src_Darcs_Util_Tree_Hashed_hs       |  13 -
| .../patch-src_Darcs_Util_Tree_Monad_hs        |  11 -
| 9 files changed, 367 insertions(+), 499 deletions(-)
| delete mode 100644 devel/darcs/patches/patch-darcs_cabal
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Patch_Annotate_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Patch_Index_Monad_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_UI_Commands_Log_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Util_Compat_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Util_Tree_Hashed_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Util_Tree_Monad_hs
|
|diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
|index e18f65c5efa..059df798e11 100644
|--- a/devel/darcs/Makefile
|+++ b/devel/darcs/Makefile
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 10.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
|index e0a820dfe34..aa2719d5daf 100644
|--- a/devel/darcs/distinfo
|+++ b/devel/darcs/distinfo
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/devel/darcs/patches/patch-darcs_cabal 
b/devel/darcs/patches/patch-darcs_cabal
|deleted file mode 100644
|index 68c6a99212f..00000000000
|--- a/devel/darcs/patches/patch-darcs_cabal
|+++ /dev/null
--------------------------
File to patch:

Reply via email to