Re: [Quilt-dev] CVS test suite fixes

[Andreas Gruenbacher]

Markus,

On Wednesday 18 January 2006 15:32, Markus F.X.J. Oberhumer wrote:
> >>I also had to add "--sort" to "diff --snapshot" in snapshot.test,
> >> probably because of filesystem related issues.

I think I've fixed that now:

Index: quilt.changes
===================================================================
RCS file: /sources/quilt/quilt/quilt.changes,v
retrieving revision 1.332
diff -u -r1.332 quilt.changes
--- quilt.changes       19 Jan 2006 08:02:05 -0000      1.332
+++ quilt.changes       19 Jan 2006 16:36:31 -0000
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Thu Jan 19 17:34:05 CET 2006 - address@hidden
+
+- Make sure quilt diff --snapshot visits files in a defined order.
+
+-------------------------------------------------------------------
 Thu Jan 19 18:52:30 AEDT 2006 - address@hidden
 
 - Move patch parameter checks into patchfns.in, adding quotes
Index: quilt/diff.in
===================================================================
RCS file: /sources/quilt/quilt/quilt/diff.in,v
retrieving revision 1.58
diff -u -r1.58 diff.in
--- quilt/diff.in       19 Jan 2006 08:02:05 -0000      1.58
+++ quilt/diff.in       19 Jan 2006 16:36:31 -0000
@@ -251,7 +251,7 @@
        do
                echo "${file#$QUILT_PC/$snap_subdir/}" >&4
        done \
-       < <(find $QUILT_PC/$snap_subdir -type f)
+       < <(find $QUILT_PC/$snap_subdir -type f | sort)
        # Also look at all patches that are currently applied.
        opt_combine=1
        first_patch="$(applied_patches | head -n 1)"


This change is in cvs now. Please speak up if you are still seeing problems.

Thanks,
Andreas