darcs-beta 2.4.98.4 → 2.4.98.5

raw patch · 5 files changed

+19/−26 lines, 5 filesdep ~hashed-storage

Dependency ranges changed: hashed-storage

Files

• darcs-beta.cabal +5/−5
• release/distributed-context +1/−1
• src/Darcs/Arguments.lhs +7/−1
• src/Darcs/Commands/TrackDown.lhs +5/−18
• src/building_darcs.tex +1/−1

@@ -1,5 +1,5 @@ Name: darcs-beta-version:        2.4.98.4+version:        2.4.98.5 License:        GPL License-file:   COPYING Author:         David Roundy <droundy@darcs.net>, <darcs-users@darcs.net>@@ -167,7 +167,7 @@                      html         == 1.0.*,                      filepath     == 1.1.*,                      haskeline    >= 0.6.2.2 && < 0.7,-                     hashed-storage == 0.5.2,+                     hashed-storage >= 0.5.2 && < 0.6,                      base >= 3,                      bytestring >= 0.9.0 && < 0.10,                      text >= 0.3,@@ -368,7 +368,7 @@                      html         == 1.0.*,                      filepath     == 1.1.*,                      haskeline    >= 0.6.2.2 && < 0.7,-                     hashed-storage == 0.5.2,+                     hashed-storage >= 0.5.2 && < 0.6,                      tar          == 0.3.*      if !os(windows)@@ -508,7 +508,7 @@                    html         == 1.0.*,                    filepath     == 1.1.*,                    haskeline    >= 0.6.2.2 && < 0.7,-                   hashed-storage == 0.5.2,+                   hashed-storage >= 0.5.2 && < 0.6,                    tar          == 0.3.*    if !os(windows)@@ -659,7 +659,7 @@                    process    == 1.0.*,                    containers >= 0.1 && < 0.4,                    array      >= 0.1 && < 0.4,-                   hashed-storage == 0.5.2,+                   hashed-storage >= 0.5.2 && < 0.6,                    random     == 1.0.*      if flag(mmap) && !os(windows)

@@ -1,1 +1,1 @@-Just "\nContext:\n\n[TAG 2.4.98.4\nReinier Lamers <tux_rocker@reinier.de>**20100823183505\n Ignore-this: 8257375d159e0d5a8cb548c6374adf39\n] \n"+Just "\nContext:\n\n[TAG 2.4.98.5\nReinier Lamers <tux_rocker@reinier.de>**20100905170906\n Ignore-this: 848f746fa6a939cef069abe6722d4206\n] \n"

@@ -683,7 +683,13 @@     where mp s = OnePattern (patchMatch s)  matchOne = DarcsMultipleChoiceOption [__match, __patch, __tag, __index]-matchOneNontag  = DarcsMultipleChoiceOption [__match, __patch, __index]+                                            -- [NOTE --index removed from matchOneNontag because issue1926]+                                            -- The --index option was removed for 2.5 release because it isn't handled+                                            -- by amend-record (see issue1926).+                                            --+                                            -- At this moment, amend-record is the only command that uses 'matchOneNontag',+                                            -- so there is no other command affected.+matchOneNontag  = DarcsMultipleChoiceOption [__match, __patch {- , __index -} ] matchSeveral    = DarcsMultipleChoiceOption [__matches, __patches, __tags] matchRange      = concatOptions $ [ matchTo, matchFrom                                   , DarcsMultipleChoiceOption [__match, __patch, __last, __indexes] ]

@@ -199,24 +199,11 @@ finally succeeds, the name of the hunted down patch is found in the output before the last test run. -FIXME: There is a new --bisect feature that needs to be finished.-Open points: GATDs. polish debugging output and add --verbose flag; documentation-(online help's already there); update this documentation.  See Issue1208.--FIXME: I also would like to add an interface by which you can tell it which-patches it should consider not including.  Without such a feature, the-following command:-\begin{verbatim}-% darcs trackdown 'make && false'-\end{verbatim}-would result in compiling every version in the repository--which is a-rather tedious prospect.--FIXME: There is a third more besides linear (no --bisect) and binary-(--bisect) search, which is described on bugs.darcs.net in Issue1638.-The idea is that no total order on the set of patches is assumed.-Delta trackdown yields the minimum number of patches that you would-need to obliterate in order to make the test succeed.+The \verb!--bisect! variant of trackdown can be useful when the sought after+patch is likely buried deep in the repository history; however, it currently+requires an potentially expensive process of applying or unapplying half the+repository's patches at a time. You may often find the straightforward linear+trackdown to be more efficient in practice.  \subsubsection{Example usage} If you want to find the last version of darcs that had a FIXME note in the

@@ -24,7 +24,7 @@  This will require the following build dependencies: \begin{itemize}-\item GHC 6.8 or higher; and+\item GHC 6.10 or higher; and \item Cabal 1.6 or higher. \end{itemize}