Patchwork [1,of,2,STABLE] transplant: update test to use hash for remote transplant

login
register
mail settings
Submitter Pierre-Yves David
Date June 30, 2015, 3:23 a.m.
Message ID <15372dd37cf6e6b9a489.1435634606@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/9827/
State Accepted
Headers show

Comments

Pierre-Yves David - June 30, 2015, 3:23 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1435630731 25200
#      Mon Jun 29 19:18:51 2015 -0700
# Branch stable
# Node ID 15372dd37cf6e6b9a4892a40525a99b004419d47
# Parent  dc05a10e1e4595381a1699a9c62548a5296e7ab3
transplant: update test to use hash for remote transplant

Transplant is apparently allowing to use revision number when transplanting
through http. I call this non-sense and update the test to use explicit hash.

This "feature" will break in the next change fixing another bug.

Patch

diff --git a/tests/test-transplant.t b/tests/test-transplant.t
--- a/tests/test-transplant.t
+++ b/tests/test-transplant.t
@@ -296,11 +296,11 @@  remote transplant with pull
   adding file changes
   added 1 changesets with 1 changes to 1 files
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ../rp
-  $ hg transplant -s http://localhost:$HGPORT/ 2 4
+  $ hg transplant -s http://localhost:$HGPORT/ 37a1297eb21b a53251cdf717
   searching for changes
   searching for changes
   adding changesets
   adding manifests
   adding file changes
@@ -311,13 +311,16 @@  remote transplant with pull
   2  b3
   1  b1
   0  r1
 
 remote transplant without pull
+(I'm pretty sure this test is actually pulling,
+It was using "2" and "4" (as the previous transplant used to) which referenced
+revision different from on run to another)
 
   $ hg pull -q http://localhost:$HGPORT/
-  $ hg transplant -s http://localhost:$HGPORT/ 2 4
+  $ hg transplant -s http://localhost:$HGPORT/ 8d9279348abb 722f4667af76
   searching for changes
   skipping already applied revision 2:8d9279348abb
   applying 722f4667af76
   722f4667af76 transplanted to 76e321915884