Patchwork [1,of,4,main-line] test: enforce bundle1 in "test-commit-interactive.t"

login
register
mail settings
Submitter Pierre-Yves David
Date Nov. 4, 2015, 2:50 p.m.
Message ID <11922c17a1df127b1f05.1446648625@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/11289/
State Accepted
Headers show

Comments

Pierre-Yves David - Nov. 4, 2015, 2:50 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1445301582 -7200
#      Tue Oct 20 02:39:42 2015 +0200
# Node ID 11922c17a1df127b1f0522f6544a6e034cd7be94
# Parent  859f453e8b4e2b42b6b6552b79c5c5e7e2fc1cf7
# EXP-Topic generaldelta
# Available At http://hg.netv6.net/marmoute-wip/mercurial/
#              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r 11922c17a1df
test: enforce bundle1 in "test-commit-interactive.t"

This test generate a bundle to get a binary file to commit. We should ensure
this binary file remains the same when we move to general delta as default.

Patch

diff --git a/tests/test-commit-interactive.t b/tests/test-commit-interactive.t
--- a/tests/test-commit-interactive.t
+++ b/tests/test-commit-interactive.t
@@ -151,11 +151,11 @@  Delete empty file
   
   
 
 Add binary file
 
-  $ hg bundle --base -2 tip.bundle
+  $ hg bundle --type v1 --base -2 tip.bundle
   1 changesets found
   $ hg add tip.bundle
   $ hg commit -i -d '4 0' -m binary<<EOF
   > y
   > EOF
@@ -176,11 +176,11 @@  Add binary file
   Binary file tip.bundle has changed
   
 
 Change binary file
 
-  $ hg bundle --base -2 tip.bundle
+  $ hg bundle --base -2 --type v1 tip.bundle
   1 changesets found
   $ hg commit -i -d '5 0' -m binary-change<<EOF
   > y
   > EOF
   diff --git a/tip.bundle b/tip.bundle
@@ -200,11 +200,11 @@  Change binary file
   
 
 Rename and change binary file
 
   $ hg mv tip.bundle top.bundle
-  $ hg bundle --base -2 top.bundle
+  $ hg bundle --base -2 --type v1 top.bundle
   1 changesets found
   $ hg commit -i -d '6 0' -m binary-change-rename<<EOF
   > y
   > EOF
   diff --git a/tip.bundle b/top.bundle