Mercurial > evolve
comparison tests/test-stabilize-result.t @ 748:4979ef2c0900
test: prepare test for core changeset 6cd9b8428104
Changeset 6cd9b8428104 in Mercurial core (2.8) make rebase preserve more
extra. this mean hash changes. We make the test resilient to that.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 15 Nov 2013 19:14:19 -0500 |
| parents | 9300f48786de |
| children | bfdfdf731f8a |
comparison
equal
deleted
inserted
replaced
| 747:9300f48786de | 748:4979ef2c0900 |
|---|---|
| 132 Make precursors public | 132 Make precursors public |
| 133 | 133 |
| 134 $ hg phase --hidden --public 8 | 134 $ hg phase --hidden --public 8 |
| 135 1 new bumped changesets | 135 1 new bumped changesets |
| 136 $ glog | 136 $ glog |
| 137 @ 12:73b15c7566e9@default(draft) bk:[] newer a | 137 @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) |
| 138 | | 138 | |
| 139 o 9:7bc2f5967f5e@default(draft) bk:[] add c | 139 o 9:7bc2f5967f5e@default(draft) bk:[] add c |
| 140 | | 140 | |
| 141 | o 8:1cf0aacfd363@default(public) bk:[] newer a | 141 | o 8:1cf0aacfd363@default(public) bk:[] newer a |
| 142 |/ | 142 |/ |
| 148 Stabilize ! | 148 Stabilize ! |
| 149 | 149 |
| 150 $ hg evolve --any --dry-run | 150 $ hg evolve --any --dry-run |
| 151 recreate:[12] newer a | 151 recreate:[12] newer a |
| 152 atop:[8] newer a | 152 atop:[8] newer a |
| 153 hg rebase --rev 73b15c7566e9 --dest 66719795a494; | 153 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) |
| 154 hg update 1cf0aacfd363; | 154 hg update 1cf0aacfd363; |
| 155 hg revert --all --rev 73b15c7566e9; | 155 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
| 156 hg commit --msg "bumped update to %s" (no-eol) | 156 hg commit --msg "bumped update to %s" (no-eol) |
| 157 $ hg evolve --any | 157 $ hg evolve --any |
| 158 recreate:[12] newer a | 158 recreate:[12] newer a |
| 159 atop:[8] newer a | 159 atop:[8] newer a |
| 160 rebasing to destination parent: 66719795a494 | 160 rebasing to destination parent: 66719795a494 |
| 161 computing new diff | 161 computing new diff |
| 162 commited as a7cabd7bd9c2 | 162 commited as (a7cabd7bd9c2|671b9d7eeaec) (re) |
| 163 $ glog | 163 $ glog |
| 164 @ 14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363: | 164 @ 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) |
| 165 | | 165 | |
| 166 | o 9:7bc2f5967f5e@default(draft) bk:[] add c | 166 | o 9:7bc2f5967f5e@default(draft) bk:[] add c |
| 167 | | | 167 | | |
| 168 o | 8:1cf0aacfd363@default(public) bk:[] newer a | 168 o | 8:1cf0aacfd363@default(public) bk:[] newer a |
| 169 |/ | 169 |/ |
| 188 > EOF | 188 > EOF |
| 189 $ hg ci -m 'More addition' | 189 $ hg ci -m 'More addition' |
| 190 $ glog | 190 $ glog |
| 191 @ 15:3932c176bbaa@default(draft) bk:[] More addition | 191 @ 15:3932c176bbaa@default(draft) bk:[] More addition |
| 192 | | 192 | |
| 193 | o 14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363: | 193 | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) |
| 194 | | | 194 | | |
| 195 o | 9:7bc2f5967f5e@default(draft) bk:[] add c | 195 o | 9:7bc2f5967f5e@default(draft) bk:[] add c |
| 196 | | | 196 | | |
| 197 | o 8:1cf0aacfd363@default(public) bk:[] newer a | 197 | o 8:1cf0aacfd363@default(public) bk:[] newer a |
| 198 |/ | 198 |/ |
| 214 $ glog | 214 $ glog |
| 215 @ 19:eacc9c8240fe@default(draft) bk:[] More addition | 215 @ 19:eacc9c8240fe@default(draft) bk:[] More addition |
| 216 | | 216 | |
| 217 | o 17:d2f173e25686@default(draft) bk:[] More addition | 217 | o 17:d2f173e25686@default(draft) bk:[] More addition |
| 218 |/ | 218 |/ |
| 219 | o 14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363: | 219 | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) |
| 220 | | | 220 | | |
| 221 o | 9:7bc2f5967f5e@default(draft) bk:[] add c | 221 o | 9:7bc2f5967f5e@default(draft) bk:[] add c |
| 222 | | | 222 | | |
| 223 | o 8:1cf0aacfd363@default(public) bk:[] newer a | 223 | o 8:1cf0aacfd363@default(public) bk:[] newer a |
| 224 |/ | 224 |/ |
| 251 committed changeset 21:f344982e63c4 | 251 committed changeset 21:f344982e63c4 |
| 252 $ hg st | 252 $ hg st |
| 253 $ glog | 253 $ glog |
| 254 @ 21:f344982e63c4@default(draft) bk:[] More addition | 254 @ 21:f344982e63c4@default(draft) bk:[] More addition |
| 255 | | 255 | |
| 256 | o 14:a7cabd7bd9c2@default(draft) bk:[] bumped update to 1cf0aacfd363: | 256 | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) |
| 257 | | | 257 | | |
| 258 o | 9:7bc2f5967f5e@default(draft) bk:[] add c | 258 o | 9:7bc2f5967f5e@default(draft) bk:[] add c |
| 259 | | | 259 | | |
| 260 | o 8:1cf0aacfd363@default(public) bk:[] newer a | 260 | o 8:1cf0aacfd363@default(public) bk:[] newer a |
| 261 |/ | 261 |/ |