Mercurial > evolve

comparison tests/test-exchange-A3.t @ 2261:3e339f6717c7 mercurial-3.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat-hg-3.9: merge with future 6.0
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 31 Mar 2017 15:44:10 +0200
parents f1ffd093ef30 a202f3af890c
children
comparison
equal deleted inserted replaced
2110:f1ffd093ef30 2261:3e339f6717c7
1 1
2 Initial setup 2 Initial setup
3 3
4 $ . $TESTDIR/_exc-util.sh 4 $ . $TESTDIR/testlib/exchange-util.sh
5 5
6 === A.3 new branch created === 6 === A.3 new branch created ===
7 7
8 .. {{{ 8 .. {{{
9 .. B' ○⇢ø B 9 .. B' ○⇢ø B
74 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 74 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
75 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000 75 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
76 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000 76 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000
77 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3bc2ee626e11a7cf8fee7a66d069271e17d5a597 77 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3bc2ee626e11a7cf8fee7a66d069271e17d5a597
78 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 91716bfd671b5a5854a47ac5d392edfdd25e431a 78 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 91716bfd671b5a5854a47ac5d392edfdd25e431a
79 $ hg debugstablerange --rev 'head()' 79 $ hg debugobshashrange --subranges --rev 'head()'
80 rev node index size depth obshash 80 rev node index size depth obshash
81 3 e5ea8f9c7314 0 2 2 3bc2ee626e11 81 3 e5ea8f9c7314 0 2 2 3bc2ee626e11
82 4 f6298a8ac3a4 0 2 2 91716bfd671b 82 4 f6298a8ac3a4 0 2 2 91716bfd671b
83 0 a9bdc8b26820 0 1 1 000000000000 83 0 a9bdc8b26820 0 1 1 000000000000
84 3 e5ea8f9c7314 1 1 2 3bc2ee626e11 84 3 e5ea8f9c7314 1 1 2 3bc2ee626e11
85 4 f6298a8ac3a4 1 1 2 91716bfd671b 85 4 f6298a8ac3a4 1 1 2 91716bfd671b
86 $ cd .. 86 $ cd ..
87 $ cd .. 87 $ cd ..
88 88
89 Actual Test for first version (changeset unknown in remote) 89 Actual Test for first version (changeset unknown in remote)
90 ----------------------------------------------------------- 90 -----------------------------------------------------------
179 $ cd A.3.b 179 $ cd A.3.b
180 $ hg push -R main -r e5ea8f9c7314 pushdest 180 $ hg push -R main -r e5ea8f9c7314 pushdest
181 pushing to pushdest 181 pushing to pushdest
182 searching for changes 182 searching for changes
183 abort: push creates new remote head e5ea8f9c7314! 183 abort: push creates new remote head e5ea8f9c7314!
184 (merge or see "hg help push" for details about pushing new heads) 184 (merge or see 'hg help push' for details about pushing new heads)
185 [255] 185 [255]
186 $ cd .. 186 $ cd ..
187 187
188 test obsmarkers exchange. 188 test obsmarkers exchange.
189 189