Mercurial > evolve
comparison tests/test-topic-mode.t @ 3914:96945ea908df stable
branching: merge default into stable
The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 12:52:06 +0200 |
| parents | eb928f5728c4 |
| children | f3713d41b85b dd68ce259708 |
comparison
equal
deleted
inserted
replaced
| 3901:f2b8429db565 | 3914:96945ea908df |
|---|---|
| 106 $ hg add a | 106 $ hg add a |
| 107 $ hg topic mytopic | 107 $ hg topic mytopic |
| 108 marked working directory as topic: mytopic | 108 marked working directory as topic: mytopic |
| 109 $ hg ci -m "Added a" | 109 $ hg ci -m "Added a" |
| 110 active topic 'mytopic' grew its first changeset | 110 active topic 'mytopic' grew its first changeset |
| 111 (see 'hg help topics' for more information) | |
| 111 | 112 |
| 112 $ hg up -r "desc('ROOT')" | 113 $ hg up -r "desc('ROOT')" |
| 113 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 114 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 114 $ touch default | 115 $ touch default |
| 115 $ hg add default | 116 $ hg add default |
| 169 $ hg add a | 170 $ hg add a |
| 170 $ hg topic mytopic | 171 $ hg topic mytopic |
| 171 marked working directory as topic: mytopic | 172 marked working directory as topic: mytopic |
| 172 $ hg ci -m "Added a" | 173 $ hg ci -m "Added a" |
| 173 active topic 'mytopic' grew its first changeset | 174 active topic 'mytopic' grew its first changeset |
| 175 (see 'hg help topics' for more information) | |
| 174 | 176 |
| 175 $ hg up -r "desc('ROOT')" | 177 $ hg up -r "desc('ROOT')" |
| 176 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 178 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 177 $ touch default | 179 $ touch default |
| 178 $ hg add default | 180 $ hg add default |
| 225 | 227 |
| 226 $ touch A | 228 $ touch A |
| 227 $ hg add A | 229 $ hg add A |
| 228 $ hg commit -m "Add A" --config devel.randomseed=42 | 230 $ hg commit -m "Add A" --config devel.randomseed=42 |
| 229 active topic 'panoramic-antelope' grew its first changeset | 231 active topic 'panoramic-antelope' grew its first changeset |
| 232 (see 'hg help topics' for more information) | |
| 230 | 233 |
| 231 $ hg up -r "desc(ROOT)" | 234 $ hg up -r "desc(ROOT)" |
| 232 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 |
| 233 | 236 |
| 234 $ touch B | 237 $ touch B |
| 235 $ hg add B | 238 $ hg add B |
| 236 $ hg commit -m "Add B" --config devel.randomseed=128 | 239 $ hg commit -m "Add B" --config devel.randomseed=128 |
| 237 active topic 'various-dove' grew its first changeset | 240 active topic 'various-dove' grew its first changeset |
| 241 (see 'hg help topics' for more information) | |
| 238 | 242 |
| 239 Test a merge too | 243 Test a merge too |
| 240 | 244 |
| 241 $ hg phase --public -r . | 245 $ hg phase --public -r . |
| 242 active topic 'various-dove' is now empty | 246 active topic 'various-dove' is now empty |
| 247 (use 'hg topic --clear' to clear it if needed) | |
| 243 $ hg up default | 248 $ hg up default |
| 244 clearing empty topic "various-dove" | 249 clearing empty topic "various-dove" |
| 245 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 250 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 246 $ hg log -G | 251 $ hg log -G |
| 247 @ changeset: 2:2d2acb6efad5 | 252 @ changeset: 2:2d2acb6efad5 |
| 286 | 291 |
| 287 $ touch A | 292 $ touch A |
| 288 $ hg add A | 293 $ hg add A |
| 289 $ hg commit -m "Add A" --config devel.randomseed=42 | 294 $ hg commit -m "Add A" --config devel.randomseed=42 |
| 290 active topic 'panoramic-antelope' grew its first changeset | 295 active topic 'panoramic-antelope' grew its first changeset |
| 296 (see 'hg help topics' for more information) | |
| 291 | 297 |
| 292 $ hg up -r "desc(ROOT)" | 298 $ hg up -r "desc(ROOT)" |
| 293 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 |
| 294 | 300 |
| 295 $ touch B | 301 $ touch B |
| 296 $ hg add B | 302 $ hg add B |
| 297 $ hg commit -m "Add B" --config devel.randomseed=128 | 303 $ hg commit -m "Add B" --config devel.randomseed=128 |
| 298 active topic 'various-dove' grew its first changeset | 304 active topic 'various-dove' grew its first changeset |
| 305 (see 'hg help topics' for more information) | |
| 299 | 306 |
| 300 Test a merge too | 307 Test a merge too |
| 301 | 308 |
| 302 $ hg phase --public -r . | 309 $ hg phase --public -r . |
| 303 active topic 'various-dove' is now empty | 310 active topic 'various-dove' is now empty |
| 311 (use 'hg topic --clear' to clear it if needed) | |
| 304 $ hg up default | 312 $ hg up default |
| 305 clearing empty topic "various-dove" | 313 clearing empty topic "various-dove" |
| 306 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 314 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 307 $ hg log -G | 315 $ hg log -G |
| 308 @ changeset: 2:2d2acb6efad5 | 316 @ changeset: 2:2d2acb6efad5 |
| 326 $ hg merge panoramic-antelope | 334 $ hg merge panoramic-antelope |
| 327 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 |
| 328 (branch merge, don't forget to commit) | 336 (branch merge, don't forget to commit) |
| 329 $ hg ci -m 'merge' --config devel.randomseed=1337 | 337 $ hg ci -m 'merge' --config devel.randomseed=1337 |
| 330 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) |