Mercurial > evolve

comparison tests/test-exchange-obsmarkers-case-A4.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 1e2f683e11e7
comparison
equal deleted inserted replaced
3107:1f61525727bf 3108:9c9c8c1eeb93
62 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 62 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
63 $ mkcommit A1 63 $ mkcommit A1
64 created new head 64 created new head
65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` 65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` 66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
67 obsoleted 1 changesets
68 $ hg log -G --hidden 67 $ hg log -G --hidden
69 @ e5ea8f9c7314 (draft): A1 68 @ e5ea8f9c7314 (draft): A1
70 | 69 |
71 | o 06055a7959d4 (draft): B 70 | o 06055a7959d4 (draft): B
72 | | 71 | |
75 o a9bdc8b26820 (public): O 74 o a9bdc8b26820 (public): O
76 75
77 $ inspect_obsmarkers 76 $ inspect_obsmarkers
78 obsstore content 77 obsstore content
79 ================ 78 ================
80 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 79 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
81 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 80 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
82 obshashtree 81 obshashtree
83 =========== 82 ===========
84 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 83 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
85 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 5d69322fad9eb1ba8f8f2c2312346ed347fdde76 84 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 5d69322fad9eb1ba8f8f2c2312346ed347fdde76
86 06055a7959d4128e6e3bccfd01482e83a2db8a3a fd3e5712c9c2d216547d7a1b87ac815ee1fb7542 85 06055a7959d4128e6e3bccfd01482e83a2db8a3a fd3e5712c9c2d216547d7a1b87ac815ee1fb7542
104 $ dotest A.4 B -f 103 $ dotest A.4 B -f
105 ## Running testcase A.4 104 ## Running testcase A.4
106 # testing echange of "B" (06055a7959d4) 105 # testing echange of "B" (06055a7959d4)
107 ## initial state 106 ## initial state
108 # obstore: main 107 # obstore: main
109 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 108 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
110 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 109 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
111 # obstore: pushdest 110 # obstore: pushdest
112 # obstore: pulldest 111 # obstore: pulldest
113 ## pushing "B" from main to pushdest 112 ## pushing "B" from main to pushdest
114 pushing to pushdest 113 pushing to pushdest
115 searching for changes 114 searching for changes
118 remote: adding file changes 117 remote: adding file changes
119 remote: added 2 changesets with 2 changes to 2 files 118 remote: added 2 changesets with 2 changes to 2 files
120 remote: 1 new obsolescence markers 119 remote: 1 new obsolescence markers
121 ## post push state 120 ## post push state
122 # obstore: main 121 # obstore: main
123 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 122 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
124 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 123 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
125 # obstore: pushdest 124 # obstore: pushdest
126 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 125 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
127 # obstore: pulldest 126 # obstore: pulldest
128 ## pulling "06055a7959d4" from main into pulldest 127 ## pulling "06055a7959d4" from main into pulldest
129 pulling from main 128 pulling from main
130 searching for changes 129 searching for changes
131 adding changesets 130 adding changesets
134 added 2 changesets with 2 changes to 2 files 133 added 2 changesets with 2 changes to 2 files
135 1 new obsolescence markers 134 1 new obsolescence markers
136 (run 'hg update' to get a working copy) 135 (run 'hg update' to get a working copy)
137 ## post pull state 136 ## post pull state
138 # obstore: main 137 # obstore: main
139 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 138 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
140 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 139 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
141 # obstore: pushdest 140 # obstore: pushdest
142 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 141 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
143 # obstore: pulldest 142 # obstore: pulldest
144 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 143 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)