Submitter | Pierre-Yves David |
---|---|
Date | Aug. 15, 2014, 9:22 p.m. |
Message ID | <05cce438ac55337f888b.1408137723@marginatus.alto.octopoid.net> |
Download | mbox | patch |
Permalink | /patch/5436/ |
State | Accepted |
Headers | show |
Comments
On Fri, Aug 15, 2014 at 02:22:03PM -0700, Pierre-Yves David wrote: > # HG changeset patch > # User Pierre-Yves David <pierre-yves.david@fb.com> > # Date 1408137555 25200 > # Fri Aug 15 14:19:15 2014 -0700 > # Node ID 05cce438ac55337f888b6a9f70976ac963605aaa > # Parent 8dda6f6ff564d8fe6ac7b8ce4c74eb9bfb5de14a > test-treediscovery: update output after merge Queued, thanks. > > Recent change in the push process introduced an extra listing of the phase > name space before the push (on default). Meanwhile on default, a fix introduced > a new test with debug output. > > We update the tests output to be correct. > > diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t > --- a/tests/test-treediscovery.t > +++ b/tests/test-treediscovery.t > @@ -520,10 +520,11 @@ Both have new stuff in existing named br > "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 > "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a > "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases > "GET /?cmd=capabilities HTTP/1.1" 200 - > "GET /?cmd=heads HTTP/1.1" 200 - > + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases > "GET /?cmd=branchmap HTTP/1.1" 200 - > "GET /?cmd=branchmap HTTP/1.1" 200 - > "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks > "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91 > "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > http://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t --- a/tests/test-treediscovery.t +++ b/tests/test-treediscovery.t @@ -520,10 +520,11 @@ Both have new stuff in existing named br "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases "GET /?cmd=capabilities HTTP/1.1" 200 - "GET /?cmd=heads HTTP/1.1" 200 - + "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases "GET /?cmd=branchmap HTTP/1.1" 200 - "GET /?cmd=branchmap HTTP/1.1" 200 - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases