Mercurial > evolve
comparison tests/test-evolve-topic.t @ 3591:98941c28f3e2 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:18:31 +0100 |
| parents | d5adce52cef4 85cdce113c2c |
| children | b92114f201c9 537fd9a86c06 |
comparison
equal
deleted
inserted
replaced
| 3590:d5adce52cef4 | 3591:98941c28f3e2 |
|---|---|
| 85 t0^ add bbb (base) | 85 t0^ add bbb (base) |
| 86 $ hg up 'desc(ddd)' | 86 $ hg up 'desc(ddd)' |
| 87 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 87 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 88 $ echo ddd >> ddd | 88 $ echo ddd >> ddd |
| 89 $ hg amend | 89 $ hg amend |
| 90 6 new orphan changesets | 90 6 new unstable changesets |
| 91 $ hg up 'desc(fff)' | 91 $ hg up 'desc(fff)' |
| 92 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 92 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 93 $ echo fff >> fff | 93 $ echo fff >> fff |
| 94 $ hg amend | 94 $ hg amend |
| 95 | 95 |
| 96 $ hg log -G | 96 $ hg log -G |
| 97 @ 11 - {foo} e104f49bab28 add fff (draft) | 97 @ 13 - {foo} e104f49bab28 add fff (draft) |
| 98 | | 98 | |
| 99 | o 10 - {foo} d9cacd156ffc add ddd (draft) | 99 | o 11 - {foo} d9cacd156ffc add ddd (draft) |
| 100 | | | 100 | | |
| 101 | | o 9 - {bar} 1d964213b023 add jjj (draft) | 101 | | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 102 | | | | 102 | | | |
| 103 | | o 8 - {bar} fcab990f3261 add iii (draft) | 103 | | o 8 - {bar} fcab990f3261 add iii (draft) |
| 104 | | | | 104 | | | |
| 121 | 121 |
| 122 Run evolve --all | 122 Run evolve --all |
| 123 | 123 |
| 124 $ hg evolve --all | 124 $ hg evolve --all |
| 125 move:[4] add eee | 125 move:[4] add eee |
| 126 atop:[10] add ddd | 126 atop:[11] add ddd |
| 127 move:[11] add fff | 127 move:[13] add fff |
| 128 atop:[12] add eee | 128 atop:[14] add eee |
| 129 working directory is now at 070c5573d8f9 | 129 working directory is now at 070c5573d8f9 |
| 130 $ hg log -G | 130 $ hg log -G |
| 131 @ 13 - {foo} 070c5573d8f9 add fff (draft) | 131 @ 15 - {foo} 070c5573d8f9 add fff (draft) |
| 132 | | 132 | |
| 133 o 12 - {foo} 42b49017ff90 add eee (draft) | 133 o 14 - {foo} 42b49017ff90 add eee (draft) |
| 134 | | 134 | |
| 135 o 10 - {foo} d9cacd156ffc add ddd (draft) | 135 o 11 - {foo} d9cacd156ffc add ddd (draft) |
| 136 | | 136 | |
| 137 | o 9 - {bar} 1d964213b023 add jjj (draft) | 137 | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 138 | | | 138 | | |
| 139 | o 8 - {bar} fcab990f3261 add iii (draft) | 139 | o 8 - {bar} fcab990f3261 add iii (draft) |
| 140 | | | 140 | | |
| 158 Test that evolve does not loose topic information | 158 Test that evolve does not loose topic information |
| 159 ------------------------------------------------- | 159 ------------------------------------------------- |
| 160 | 160 |
| 161 $ hg evolve --rev 'topic(bar)' | 161 $ hg evolve --rev 'topic(bar)' |
| 162 move:[6] add ggg | 162 move:[6] add ggg |
| 163 atop:[13] add fff | 163 atop:[15] add fff |
| 164 move:[7] add hhh | 164 move:[7] add hhh |
| 165 atop:[14] add ggg | 165 atop:[16] add ggg |
| 166 move:[8] add iii | 166 move:[8] add iii |
| 167 atop:[15] add hhh | 167 atop:[17] add hhh |
| 168 move:[9] add jjj | 168 move:[9] add jjj |
| 169 atop:[16] add iii | 169 atop:[18] add iii |
| 170 working directory is now at 9bf430c106b7 | 170 working directory is now at 9bf430c106b7 |
| 171 $ hg log -G | 171 $ hg log -G |
| 172 @ 17 - {bar} 9bf430c106b7 add jjj (draft) | 172 @ 19 - {bar} 9bf430c106b7 add jjj (draft) |
| 173 | | 173 | |
| 174 o 16 - {bar} d2dc89c57700 add iii (draft) | 174 o 18 - {bar} d2dc89c57700 add iii (draft) |
| 175 | | 175 | |
| 176 o 15 - {bar} 20bc4d02aa62 add hhh (draft) | 176 o 17 - {bar} 20bc4d02aa62 add hhh (draft) |
| 177 | | 177 | |
| 178 o 14 - {bar} 16d6f664b17c add ggg (draft) | 178 o 16 - {bar} 16d6f664b17c add ggg (draft) |
| 179 | | 179 | |
| 180 o 13 - {foo} 070c5573d8f9 add fff (draft) | 180 o 15 - {foo} 070c5573d8f9 add fff (draft) |
| 181 | | 181 | |
| 182 o 12 - {foo} 42b49017ff90 add eee (draft) | 182 o 14 - {foo} 42b49017ff90 add eee (draft) |
| 183 | | 183 | |
| 184 o 10 - {foo} d9cacd156ffc add ddd (draft) | 184 o 11 - {foo} d9cacd156ffc add ddd (draft) |
| 185 | | 185 | |
| 186 o 2 - {foo} cced9bac76e3 add ccc (draft) | 186 o 2 - {foo} cced9bac76e3 add ccc (draft) |
| 187 | | 187 | |
| 188 o 1 - {} a4dbed0837ea add bbb (draft) | 188 o 1 - {} a4dbed0837ea add bbb (draft) |
| 189 | | 189 | |
| 198 $ hg up foo | 198 $ hg up foo |
| 199 switching to topic foo | 199 switching to topic foo |
| 200 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 200 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 201 $ hg prev | 201 $ hg prev |
| 202 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 202 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 203 [12] add eee | 203 [14] add eee |
| 204 $ hg next | 204 $ hg next |
| 205 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 205 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 206 [13] add fff | 206 [15] add fff |
| 207 $ hg next | 207 $ hg next |
| 208 no children on topic "foo" | 208 no children on topic "foo" |
| 209 do you want --no-topic | 209 do you want --no-topic |
| 210 [1] | 210 [1] |
| 211 $ hg next --no-topic | 211 $ hg next --no-topic |
| 212 switching to topic bar | 212 switching to topic bar |
| 213 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 213 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 214 [14] add ggg | 214 [16] add ggg |
| 215 $ hg prev | 215 $ hg prev |
| 216 preserving the current topic 'bar' | 216 preserving the current topic 'bar' |
| 217 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 217 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 218 [13] add fff | 218 [15] add fff |
| 219 $ hg prev | 219 $ hg prev |
| 220 no parent in topic "bar" | 220 no parent in topic "bar" |
| 221 (do you want --no-topic) | 221 (do you want --no-topic) |
| 222 [1] | 222 [1] |
| 223 $ hg prev --no-topic | 223 $ hg prev --no-topic |
| 224 switching to topic foo | 224 switching to topic foo |
| 225 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 225 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 226 [12] add eee | 226 [14] add eee |
| 227 | 227 |
| 228 Testing when instability is involved | 228 Testing when instability is involved |
| 229 | 229 |
| 230 $ hg log -G | 230 $ hg log -G |
| 231 o 17 - {bar} 9bf430c106b7 add jjj (draft) | 231 o 19 - {bar} 9bf430c106b7 add jjj (draft) |
| 232 | | 232 | |
| 233 o 16 - {bar} d2dc89c57700 add iii (draft) | 233 o 18 - {bar} d2dc89c57700 add iii (draft) |
| 234 | | 234 | |
| 235 o 15 - {bar} 20bc4d02aa62 add hhh (draft) | 235 o 17 - {bar} 20bc4d02aa62 add hhh (draft) |
| 236 | | 236 | |
| 237 o 14 - {bar} 16d6f664b17c add ggg (draft) | 237 o 16 - {bar} 16d6f664b17c add ggg (draft) |
| 238 | | 238 | |
| 239 o 13 - {foo} 070c5573d8f9 add fff (draft) | 239 o 15 - {foo} 070c5573d8f9 add fff (draft) |
| 240 | | 240 | |
| 241 @ 12 - {foo} 42b49017ff90 add eee (draft) | 241 @ 14 - {foo} 42b49017ff90 add eee (draft) |
| 242 | | 242 | |
| 243 o 10 - {foo} d9cacd156ffc add ddd (draft) | 243 o 11 - {foo} d9cacd156ffc add ddd (draft) |
| 244 | | 244 | |
| 245 o 2 - {foo} cced9bac76e3 add ccc (draft) | 245 o 2 - {foo} cced9bac76e3 add ccc (draft) |
| 246 | | 246 | |
| 247 o 1 - {} a4dbed0837ea add bbb (draft) | 247 o 1 - {} a4dbed0837ea add bbb (draft) |
| 248 | | 248 | |
| 264 t1: add fff | 264 t1: add fff |
| 265 t0^ add eee (base) | 265 t0^ add eee (base) |
| 266 | 266 |
| 267 $ hg prev | 267 $ hg prev |
| 268 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 268 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 269 [18] add fff | 269 [20] add fff |
| 270 | 270 |
| 271 Testing issue 5708 when we are on obsolete changeset and there is active topic | 271 Testing issue 5708 when we are on obsolete changeset and there is active topic |
| 272 ------------------------------------------------------------------------------ | 272 ------------------------------------------------------------------------------ |
| 273 | 273 |
| 274 $ hg log --graph | 274 $ hg log --graph |
| 275 @ 18 - {bar} 793eb6370b2d add fff (draft) | 275 @ 20 - {bar} 793eb6370b2d add fff (draft) |
| 276 | | 276 | |
| 277 | o 17 - {bar} 9bf430c106b7 add jjj (draft) | 277 | o 19 - {bar} 9bf430c106b7 add jjj (draft) |
| 278 | | | 278 | | |
| 279 | o 16 - {bar} d2dc89c57700 add iii (draft) | 279 | o 18 - {bar} d2dc89c57700 add iii (draft) |
| 280 | | | 280 | | |
| 281 | o 15 - {bar} 20bc4d02aa62 add hhh (draft) | 281 | o 17 - {bar} 20bc4d02aa62 add hhh (draft) |
| 282 | | | 282 | | |
| 283 | o 14 - {bar} 16d6f664b17c add ggg (draft) | 283 | o 16 - {bar} 16d6f664b17c add ggg (draft) |
| 284 | | | 284 | | |
| 285 | x 13 - {foo} 070c5573d8f9 add fff (draft) | 285 | x 15 - {foo} 070c5573d8f9 add fff (draft) |
| 286 |/ | 286 |/ |
| 287 o 12 - {foo} 42b49017ff90 add eee (draft) | 287 o 14 - {foo} 42b49017ff90 add eee (draft) |
| 288 | | 288 | |
| 289 o 10 - {foo} d9cacd156ffc add ddd (draft) | 289 o 11 - {foo} d9cacd156ffc add ddd (draft) |
| 290 | | 290 | |
| 291 o 2 - {foo} cced9bac76e3 add ccc (draft) | 291 o 2 - {foo} cced9bac76e3 add ccc (draft) |
| 292 | | 292 | |
| 293 o 1 - {} a4dbed0837ea add bbb (draft) | 293 o 1 - {} a4dbed0837ea add bbb (draft) |
| 294 | | 294 | |
| 308 $ hg up 20bc4d02aa62 | 308 $ hg up 20bc4d02aa62 |
| 309 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 309 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 310 working directory parent is obsolete! (20bc4d02aa62) | 310 working directory parent is obsolete! (20bc4d02aa62) |
| 311 (use 'hg evolve' to update to its successor: d834582d9ee3) | 311 (use 'hg evolve' to update to its successor: d834582d9ee3) |
| 312 $ hg log -Gr 14:: | 312 $ hg log -Gr 14:: |
| 313 o 19 - {bar} d834582d9ee3 add hhh (draft) | 313 o 22 - {bar} d834582d9ee3 add hhh (draft) |
| 314 | | 314 | |
| 315 | o 17 - {bar} 9bf430c106b7 add jjj (draft) | 315 | o 20 - {bar} 793eb6370b2d add fff (draft) |
| 316 | | | 316 | | |
| 317 | o 16 - {bar} d2dc89c57700 add iii (draft) | 317 | | o 19 - {bar} 9bf430c106b7 add jjj (draft) |
| 318 | | | 318 | | | |
| 319 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) | 319 | | o 18 - {bar} d2dc89c57700 add iii (draft) |
| 320 |/ | 320 | | | |
| 321 o 14 - {bar} 16d6f664b17c add ggg (draft) | 321 +---@ 17 - {bar} 20bc4d02aa62 add hhh (draft) |
| 322 | | | |
| 323 o | 16 - {bar} 16d6f664b17c add ggg (draft) | |
| 324 | | | |
| 325 x | 15 - {foo} 070c5573d8f9 add fff (draft) | |
| 326 |/ | |
| 327 o 14 - {foo} 42b49017ff90 add eee (draft) | |
| 322 | | 328 | |
| 323 ~ | 329 ~ |
| 324 | 330 |
| 325 $ hg prev | 331 $ hg prev |
| 326 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 332 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 327 [14] add ggg | 333 [16] add ggg |
| 328 | 334 |
| 329 When the current topic and successors topic are same, but obsolete cset has | 335 When the current topic and successors topic are same, but obsolete cset has |
| 330 different topic | 336 different topic |
| 331 | 337 |
| 332 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= | 338 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
| 333 rebasing 16:d2dc89c57700 "add iii" (bar) | 339 rebasing 18:d2dc89c57700 "add iii" |
| 334 rebasing 17:9bf430c106b7 "add jjj" (bar) | 340 rebasing 19:9bf430c106b7 "add jjj" |
| 335 $ hg log -Gr 42b49017ff90:: | 341 $ hg log -Gr 42b49017ff90:: |
| 336 o 21 - {bar} 7542e76aba2c add jjj (draft) | 342 o 24 - {bar} 7542e76aba2c add jjj (draft) |
| 337 | | 343 | |
| 338 o 20 - {bar} 7858bd7e9906 add iii (draft) | 344 o 23 - {bar} 7858bd7e9906 add iii (draft) |
| 339 | | 345 | |
| 340 o 19 - {bar} d834582d9ee3 add hhh (draft) | 346 o 22 - {bar} d834582d9ee3 add hhh (draft) |
| 341 | | 347 | |
| 342 | o 18 - {bar} 793eb6370b2d add fff (draft) | 348 | o 20 - {bar} 793eb6370b2d add fff (draft) |
| 343 | | | 349 | | |
| 344 @ | 14 - {bar} 16d6f664b17c add ggg (draft) | 350 @ | 16 - {bar} 16d6f664b17c add ggg (draft) |
| 345 | | | 351 | | |
| 346 x | 13 - {foo} 070c5573d8f9 add fff (draft) | 352 x | 15 - {foo} 070c5573d8f9 add fff (draft) |
| 347 |/ | 353 |/ |
| 348 o 12 - {foo} 42b49017ff90 add eee (draft) | 354 o 14 - {foo} 42b49017ff90 add eee (draft) |
| 349 | | 355 | |
| 350 ~ | 356 ~ |
| 351 | 357 |
| 352 $ hg up 070c5573d8f9 | 358 $ hg up 070c5573d8f9 |
| 353 switching to topic foo | 359 switching to topic foo |
| 368 $ hg up 070c5573d8f9 | 374 $ hg up 070c5573d8f9 |
| 369 switching to topic foo | 375 switching to topic foo |
| 370 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 376 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 371 $ hg prev | 377 $ hg prev |
| 372 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 378 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 373 [12] add eee | 379 [14] add eee |