Mercurial > evolve

comparison tests/test-exchange-obsmarkers-case-A2.t @ 3108:9c9c8c1eeb93 mercurial-4.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge with mercurial-4.3 branch
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 18:34:22 +0200
parents 67b59d1657cf ccfcacc5ee7c
children
comparison
equal deleted inserted replaced
3107:1f61525727bf 3108:9c9c8c1eeb93
69 o a9bdc8b26820 (public): O 69 o a9bdc8b26820 (public): O
70 70
71 $ inspect_obsmarkers 71 $ inspect_obsmarkers
72 obsstore content 72 obsstore content
73 ================ 73 ================
74 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 74 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
75 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 75 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
76 obshashtree 76 obshashtree
77 =========== 77 ===========
78 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 78 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
79 f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98 79 f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98
80 35b1839966785d5703a01607229eea932db42f87 b9c8f20eef8938ebab939fe6a592587feacf3245 80 35b1839966785d5703a01607229eea932db42f87 b9c8f20eef8938ebab939fe6a592587feacf3245
95 $ dotest A.2 A 95 $ dotest A.2 A
96 ## Running testcase A.2 96 ## Running testcase A.2
97 # testing echange of "A" (f5bc6836db60) 97 # testing echange of "A" (f5bc6836db60)
98 ## initial state 98 ## initial state
99 # obstore: main 99 # obstore: main
100 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 100 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
101 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 101 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
102 # obstore: pushdest 102 # obstore: pushdest
103 # obstore: pulldest 103 # obstore: pulldest
104 ## pushing "A" from main to pushdest 104 ## pushing "A" from main to pushdest
105 pushing to pushdest 105 pushing to pushdest
106 searching for changes 106 searching for changes
109 remote: adding file changes 109 remote: adding file changes
110 remote: added 1 changesets with 1 changes to 1 files 110 remote: added 1 changesets with 1 changes to 1 files
111 remote: 1 new obsolescence markers 111 remote: 1 new obsolescence markers
112 ## post push state 112 ## post push state
113 # obstore: main 113 # obstore: main
114 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 114 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
115 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 115 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
116 # obstore: pushdest 116 # obstore: pushdest
117 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 117 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
118 # obstore: pulldest 118 # obstore: pulldest
119 ## pulling "f5bc6836db60" from main into pulldest 119 ## pulling "f5bc6836db60" from main into pulldest
120 pulling from main 120 pulling from main
121 searching for changes 121 searching for changes
122 adding changesets 122 adding changesets
125 added 1 changesets with 1 changes to 1 files 125 added 1 changesets with 1 changes to 1 files
126 1 new obsolescence markers 126 1 new obsolescence markers
127 (run 'hg update' to get a working copy) 127 (run 'hg update' to get a working copy)
128 ## post pull state 128 ## post pull state
129 # obstore: main 129 # obstore: main
130 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 130 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
131 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 131 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
132 # obstore: pushdest 132 # obstore: pushdest
133 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 133 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
134 # obstore: pulldest 134 # obstore: pulldest
135 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 135 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
136 136
137 $ cd .. 137 $ cd ..