Mercurial > evolve

comparison tests/test-exchange-obsmarkers-case-B7.t @ 3592:7a5c3175015e mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:32:54 +0100
parents 98941c28f3e2
children
comparison
equal deleted inserted replaced
3591:98941c28f3e2 3592:7a5c3175015e
64 o a9bdc8b26820 (public): O 64 o a9bdc8b26820 (public): O
65 65
66 $ inspect_obsmarkers 66 $ inspect_obsmarkers
67 obsstore content 67 obsstore content
68 ================ 68 ================
69 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 69 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
70 obshashtree 70 obshashtree
71 =========== 71 ===========
72 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 72 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
73 f5bc6836db60e308a17ba08bf050154ba9c4fad7 926d9d84b97b3483891ae983990ad87c1f7827e9 73 f5bc6836db60e308a17ba08bf050154ba9c4fad7 8408066feeb4e37fa26d01fe5c93bea92e450608
74 f6fbb35d8ac958bbe70035e4c789c18471cdc0af c2398c6305068b6b377f36402c507b713a7c586f 74 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 535b0c799a3a273fee10934abcb9e8eb9924b4bf
75 obshashrange 75 obshashrange
76 ============ 76 ============
77 rev node index size depth obshash 77 rev node index size depth obshash
78 1 f5bc6836db60 0 2 2 926d9d84b97b 78 1 f5bc6836db60 0 2 2 8408066feeb4
79 0 a9bdc8b26820 0 1 1 000000000000 79 0 a9bdc8b26820 0 1 1 000000000000
80 1 f5bc6836db60 1 1 2 926d9d84b97b 80 1 f5bc6836db60 1 1 2 8408066feeb4
81 $ cd .. 81 $ cd ..
82 $ cd .. 82 $ cd ..
83 83
84 Actual Test 84 Actual Test
85 ------------------------------------- 85 -------------------------------------
87 $ dotest B.7 O 87 $ dotest B.7 O
88 ## Running testcase B.7 88 ## Running testcase B.7
89 # testing echange of "O" (a9bdc8b26820) 89 # testing echange of "O" (a9bdc8b26820)
90 ## initial state 90 ## initial state
91 # obstore: main 91 # obstore: main
92 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 92 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
93 # obstore: pushdest 93 # obstore: pushdest
94 # obstore: pulldest 94 # obstore: pulldest
95 ## pushing "O" from main to pushdest 95 ## pushing "O" from main to pushdest
96 pushing to pushdest 96 pushing to pushdest
97 searching for changes 97 searching for changes
98 no changes found 98 no changes found
99 ## post push state 99 ## post push state
100 # obstore: main 100 # obstore: main
101 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 101 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
102 # obstore: pushdest 102 # obstore: pushdest
103 # obstore: pulldest 103 # obstore: pulldest
104 ## pulling "a9bdc8b26820" from main into pulldest 104 ## pulling "a9bdc8b26820" from main into pulldest
105 pulling from main 105 pulling from main
106 no changes found 106 no changes found
107 ## post pull state 107 ## post pull state
108 # obstore: main 108 # obstore: main
109 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 109 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
110 # obstore: pushdest 110 # obstore: pushdest
111 # obstore: pulldest 111 # obstore: pulldest