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

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
46 @ f5bc6836db60 (draft): A 46 @ f5bc6836db60 (draft): A
47 | 47 |
48 o a9bdc8b26820 (public): O 48 o a9bdc8b26820 (public): O
49 49
50 $ hg debugobsolete 50 $ hg debugobsolete
51 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 51 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
52 $ cd .. 52 $ cd ..
53 $ cd .. 53 $ cd ..
54 54
55 Actual Test 55 Actual Test
56 ------------------------------------- 56 -------------------------------------
58 $ dotest B.7 O 58 $ dotest B.7 O
59 ## Running testcase B.7 59 ## Running testcase B.7
60 # testing echange of "O" (a9bdc8b26820) 60 # testing echange of "O" (a9bdc8b26820)
61 ## initial state 61 ## initial state
62 # obstore: main 62 # obstore: main
63 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 63 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
64 # obstore: pushdest 64 # obstore: pushdest
65 # obstore: pulldest 65 # obstore: pulldest
66 ## pushing "O" from main to pushdest 66 ## pushing "O" from main to pushdest
67 pushing to pushdest 67 pushing to pushdest
68 searching for changes 68 searching for changes
71 OBSEXC: computing markers relevant to 1 nodes 71 OBSEXC: computing markers relevant to 1 nodes
72 OBSEXC: no marker to push 72 OBSEXC: no marker to push
73 OBSEXC: DONE 73 OBSEXC: DONE
74 ## post push state 74 ## post push state
75 # obstore: main 75 # obstore: main
76 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 76 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
77 # obstore: pushdest 77 # obstore: pushdest
78 # obstore: pulldest 78 # obstore: pulldest
79 ## pulling "a9bdc8b26820" from main into pulldest 79 ## pulling "a9bdc8b26820" from main into pulldest
80 pulling from main 80 pulling from main
81 no changes found 81 no changes found
82 OBSEXC: pull obsolescence markers 82 OBSEXC: pull obsolescence markers
83 OBSEXC: no unknown remote markers 83 OBSEXC: no unknown remote markers
84 OBSEXC: DONE 84 OBSEXC: DONE
85 ## post pull state 85 ## post pull state
86 # obstore: main 86 # obstore: main
87 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'} 87 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
88 # obstore: pushdest 88 # obstore: pushdest
89 # obstore: pulldest 89 # obstore: pulldest
90 90