Mercurial > evolve

comparison tests/test-evolve-content-divergent-stack.t @ 5722:61d2f1cf90f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 22 Jan 2021 11:04:55 +0100
parents e5d91fd1f319 b3d9e6c805d6
children 8e4f6354b316 4688b7eb7e40
comparison
equal deleted inserted replaced
5705:9f8ff149f258 5722:61d2f1cf90f0
574 with: [13] added d 574 with: [13] added d
575 base: [4] added d 575 base: [4] added d
576 rebasing "divergent" content-divergent changeset c72d2885eb51 on 6c228f1e5409 576 rebasing "divergent" content-divergent changeset c72d2885eb51 on 6c228f1e5409
577 rebasing "other" content-divergent changeset d45f050514c2 on 6c228f1e5409 577 rebasing "other" content-divergent changeset d45f050514c2 on 6c228f1e5409
578 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 578 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
579 working directory is now at c758af982013
580 $ hg glog 579 $ hg glog
581 o 25:957008d45543 added d 580 o 25:957008d45543 added d
582 | () [default] draft 581 | () [default] draft
583 o 22:6c228f1e5409 added c 582 o 22:6c228f1e5409 added c
584 | () [default] draft 583 | () [default] draft