Mercurial > evolve
comparison tests/test-exchange-D3.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 |
|---|---|
| 50 |/ | 50 |/ |
| 51 o a9bdc8b26820 (public): O | 51 o a9bdc8b26820 (public): O |
| 52 | 52 |
| 53 $ hg debugobsolete | 53 $ hg debugobsolete |
| 54 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 54 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 55 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'} | 55 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 56 $ cd .. | 56 $ cd .. |
| 57 $ cd .. | 57 $ cd .. |
| 58 | 58 |
| 59 Actual Test | 59 Actual Test |
| 60 ------------------------------------- | 60 ------------------------------------- |
| 63 ## Running testcase D.2 | 63 ## Running testcase D.2 |
| 64 # testing echange of "O" (a9bdc8b26820) | 64 # testing echange of "O" (a9bdc8b26820) |
| 65 ## initial state | 65 ## initial state |
| 66 # obstore: main | 66 # obstore: main |
| 67 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 67 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 68 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'} | 68 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 69 # obstore: pushdest | 69 # obstore: pushdest |
| 70 # obstore: pulldest | 70 # obstore: pulldest |
| 71 ## pushing "O" from main to pushdest | 71 ## pushing "O" from main to pushdest |
| 72 pushing to pushdest | 72 pushing to pushdest |
| 73 searching for changes | 73 searching for changes |
| 77 OBSEXC: no marker to push | 77 OBSEXC: no marker to push |
| 78 OBSEXC: DONE | 78 OBSEXC: DONE |
| 79 ## post push state | 79 ## post push state |
| 80 # obstore: main | 80 # obstore: main |
| 81 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 81 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 82 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'} | 82 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 83 # obstore: pushdest | 83 # obstore: pushdest |
| 84 # obstore: pulldest | 84 # obstore: pulldest |
| 85 ## pulling "a9bdc8b26820" from main into pulldest | 85 ## pulling "a9bdc8b26820" from main into pulldest |
| 86 pulling from main | 86 pulling from main |
| 87 no changes found | 87 no changes found |
| 89 OBSEXC: no unknown remote markers | 89 OBSEXC: no unknown remote markers |
| 90 OBSEXC: DONE | 90 OBSEXC: DONE |
| 91 ## post pull state | 91 ## post pull state |
| 92 # obstore: main | 92 # obstore: main |
| 93 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 93 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 94 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'} | 94 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
| 95 # obstore: pushdest | 95 # obstore: pushdest |
| 96 # obstore: pulldest | 96 # obstore: pulldest |
| 97 | 97 |