Mercurial > evolve

comparison tests/test-exchange-D1.t @ 1067:5d063fed9e3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: yield to relevant markers handling in core The handling of obsolescence marker is now performed in core. If we detect a mercurial with such power we skip the wrapping from evolve. This changeset also suffer from massive diff from the change in display of obsolescence marker with parent information introduced at the same time in core.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 20 Aug 2014 20:49:48 -0700
parents f355bbc124fc
children 5717d023da63
comparison
equal deleted inserted replaced
1066:045f7de9e4d3 1067:5d063fed9e3d
49 | 49 |
50 o a9bdc8b26820 (public): O 50 o a9bdc8b26820 (public): O
51 51
52 $ hg debugobsolete 52 $ hg debugobsolete
53 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 53 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
54 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'} 54 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
55 $ cd .. 55 $ cd ..
56 $ cd .. 56 $ cd ..
57 57
58 Actual Test 58 Actual Test
59 ------------------------------------- 59 -------------------------------------
61 $ dotest D.1 A1 61 $ dotest D.1 A1
62 ## Running testcase D.1 62 ## Running testcase D.1
63 # testing echange of "A1" (e5ea8f9c7314) 63 # testing echange of "A1" (e5ea8f9c7314)
64 ## initial state 64 ## initial state
65 # obstore: main 65 # obstore: main
66 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'} 66 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
67 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 67 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
68 # obstore: pushdest 68 # obstore: pushdest
69 # obstore: pulldest 69 # obstore: pulldest
70 ## pushing "A1" from main to pushdest 70 ## pushing "A1" from main to pushdest
71 pushing to pushdest 71 pushing to pushdest
78 OBSEXC: computing markers relevant to 2 nodes 78 OBSEXC: computing markers relevant to 2 nodes
79 OBSEXC: pushing 2 obsolescence markers (153 bytes) 79 OBSEXC: pushing 2 obsolescence markers (153 bytes)
80 OBSEXC: DONE 80 OBSEXC: DONE
81 ## post push state 81 ## post push state
82 # obstore: main 82 # obstore: main
83 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'} 83 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
84 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 84 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
85 # obstore: pushdest 85 # obstore: pushdest
86 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'} 86 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
87 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 87 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
88 # obstore: pulldest 88 # obstore: pulldest
89 ## pulling "e5ea8f9c7314" from main into pulldest 89 ## pulling "e5ea8f9c7314" from main into pulldest
90 pulling from main 90 pulling from main
91 searching for changes 91 searching for changes
98 OBSEXC: 2 obsolescence markers added 98 OBSEXC: 2 obsolescence markers added
99 OBSEXC: DONE 99 OBSEXC: DONE
100 (run 'hg update' to get a working copy) 100 (run 'hg update' to get a working copy)
101 ## post pull state 101 ## post pull state
102 # obstore: main 102 # obstore: main
103 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'} 103 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
104 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 104 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
105 # obstore: pushdest 105 # obstore: pushdest
106 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'} 106 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
107 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 107 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
108 # obstore: pulldest 108 # obstore: pulldest
109 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'} 109 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
110 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 110 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
111 111