blob: 5093f7125d24e679263bfe7cb6ac937db1eb4987 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
The Debian packaging of git-repair is maintained in git, using the merging
workflow described in dgit-maint-merge(7). There isn't a patch queue that can
be represented as a quilt series.
A detailed breakdown of the changes is available from their canonical
representation - git commits in the packaging repository. For example, to see
the changes made by the Debian maintainer in the first upload of upstream
version 1.2.3, you could use:
% git clone https://git.dgit.debian.org/git-repair
% cd git-repair
% git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
(If you have dgit, use `dgit clone git-repair`, rather than plain `git
clone`.)
A single combined diff, containing all the changes, follows.
--- git-repair-1.20200102.orig/Utility/HumanTime.hs
+++ git-repair-1.20200102/Utility/HumanTime.hs
@@ -44,7 +44,7 @@ daysToDuration :: Integer -> Duration
daysToDuration i = Duration $ i * dsecs
{- Parses a human-input time duration, of the form "5h", "1m", "5h1m", etc -}
-parseDuration :: Monad m => String -> m Duration
+parseDuration :: MonadFail m => String -> m Duration
parseDuration = maybe parsefail (return . Duration) . go 0
where
go n [] = return n
|