[PATCH] test-subrepo-git: ignore pax_global_header when listing archive

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu May 7 23:51:46 UTC 2015


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1431042238 25200
#      Thu May 07 16:43:58 2015 -0700
# Node ID e599c008a759b0ce99fd376138a0daf70c76e229
# Parent  17ba4ccd20b48511b3d06ab47fb1b2faf31410d7
test-subrepo-git: ignore pax_global_header when listing archive

5115d03440f4 is adding a new tar call but forgot to filter out the
pax_global_header file that some tar versions write. This is similar to what
happened in 5dda6c708138.

diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -324,11 +324,11 @@ archive subrepos
   ../archive_x/a
   ../archive_x/s
   ../archive_x/s/g
 
   $ hg -R ../tc archive -S ../archive.tgz --prefix '.' 2>/dev/null
-  $ tar -tzf ../archive.tgz | sort
+  $ tar -tzf ../archive.tgz | sort | grep -v pax_global_header
   .hg_archival.txt
   .hgsub
   .hgsubstate
   a
   s/g


More information about the Mercurial-devel mailing list