Mercurial > evolve
comparison tests/test-topic-mode.t @ 4813:dd68ce259708 stable
topic: add a new random attribute
(This is mostly an excuse to test the format-source setup)
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 06 Aug 2019 19:27:54 +0200 |
| parents | eb928f5728c4 |
| children | f76141f3ce80 1a33b31ad9a3 |
comparison
equal
deleted
inserted
replaced
| 4809:f97379faefa3 | 4813:dd68ce259708 |
|---|---|
| 226 adding ROOT | 226 adding ROOT |
| 227 | 227 |
| 228 $ touch A | 228 $ touch A |
| 229 $ hg add A | 229 $ hg add A |
| 230 $ hg commit -m "Add A" --config devel.randomseed=42 | 230 $ hg commit -m "Add A" --config devel.randomseed=42 |
| 231 active topic 'panoramic-antelope' grew its first changeset | 231 active topic 'palatial-antelope' grew its first changeset |
| 232 (see 'hg help topics' for more information) | 232 (see 'hg help topics' for more information) |
| 233 | 233 |
| 234 $ hg up -r "desc(ROOT)" | 234 $ hg up -r "desc(ROOT)" |
| 235 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 235 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 236 | 236 |
| 254 | parent: 0:ec1d2790416d | 254 | parent: 0:ec1d2790416d |
| 255 | user: test | 255 | user: test |
| 256 | date: Thu Jan 01 00:00:00 1970 +0000 | 256 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 257 | summary: Add B | 257 | summary: Add B |
| 258 | | 258 | |
| 259 | o changeset: 1:d4b548f35972 | 259 | o changeset: 1:d502ab6d9d91 |
| 260 |/ topic: panoramic-antelope | 260 |/ topic: palatial-antelope |
| 261 | user: test | 261 | user: test |
| 262 | date: Thu Jan 01 00:00:00 1970 +0000 | 262 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 263 | summary: Add A | 263 | summary: Add A |
| 264 | | 264 | |
| 265 o changeset: 0:ec1d2790416d | 265 o changeset: 0:ec1d2790416d |
| 266 user: test | 266 user: test |
| 267 date: Thu Jan 01 00:00:00 1970 +0000 | 267 date: Thu Jan 01 00:00:00 1970 +0000 |
| 268 summary: ROOT | 268 summary: ROOT |
| 269 | 269 |
| 270 $ hg merge panoramic-antelope | 270 $ hg merge palatial-antelope |
| 271 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 271 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 272 (branch merge, don't forget to commit) | 272 (branch merge, don't forget to commit) |
| 273 $ hg ci -m 'merge' | 273 $ hg ci -m 'merge' |
| 274 Testing the config knob to use a random topic for untopic commit (even for merge) | 274 Testing the config knob to use a random topic for untopic commit (even for merge) |
| 275 ================================================================================= | 275 ================================================================================= |
| 290 adding ROOT | 290 adding ROOT |
| 291 | 291 |
| 292 $ touch A | 292 $ touch A |
| 293 $ hg add A | 293 $ hg add A |
| 294 $ hg commit -m "Add A" --config devel.randomseed=42 | 294 $ hg commit -m "Add A" --config devel.randomseed=42 |
| 295 active topic 'panoramic-antelope' grew its first changeset | 295 active topic 'palatial-antelope' grew its first changeset |
| 296 (see 'hg help topics' for more information) | 296 (see 'hg help topics' for more information) |
| 297 | 297 |
| 298 $ hg up -r "desc(ROOT)" | 298 $ hg up -r "desc(ROOT)" |
| 299 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 299 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 300 | 300 |
| 318 | parent: 0:ec1d2790416d | 318 | parent: 0:ec1d2790416d |
| 319 | user: test | 319 | user: test |
| 320 | date: Thu Jan 01 00:00:00 1970 +0000 | 320 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 321 | summary: Add B | 321 | summary: Add B |
| 322 | | 322 | |
| 323 | o changeset: 1:d4b548f35972 | 323 | o changeset: 1:d502ab6d9d91 |
| 324 |/ topic: panoramic-antelope | 324 |/ topic: palatial-antelope |
| 325 | user: test | 325 | user: test |
| 326 | date: Thu Jan 01 00:00:00 1970 +0000 | 326 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 327 | summary: Add A | 327 | summary: Add A |
| 328 | | 328 | |
| 329 o changeset: 0:ec1d2790416d | 329 o changeset: 0:ec1d2790416d |
| 330 user: test | 330 user: test |
| 331 date: Thu Jan 01 00:00:00 1970 +0000 | 331 date: Thu Jan 01 00:00:00 1970 +0000 |
| 332 summary: ROOT | 332 summary: ROOT |
| 333 | 333 |
| 334 $ hg merge panoramic-antelope | 334 $ hg merge palatial-antelope |
| 335 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 335 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 336 (branch merge, don't forget to commit) | 336 (branch merge, don't forget to commit) |
| 337 $ hg ci -m 'merge' --config devel.randomseed=1337 | 337 $ hg ci -m 'merge' --config devel.randomseed=1337 |
| 338 active topic 'omniscient-locust' grew its first changeset | 338 active topic 'omniscient-locust' grew its first changeset |
| 339 (see 'hg help topics' for more information) | 339 (see 'hg help topics' for more information) |