did evolve+histedit screw up some changesets??
Uwe Brauer
oub at mat.ucm.es
Thu Aug 11 10:44:58 UTC 2022
>>> "CO" == Craig Ozancin <c.ozancin at gmail.com> writes:
> First lets clear up a misunderstanding when doing hg log -G. Obsolete
> changes are marked with a x. These will only show when using the --hidden
> option. However, unstable changesets are also marked with an x. In this
> case they will show in the log -G output. They mean that the changeset has
> become unstable due to evolve changes. They can usually be resolve by
> running hg evolve.
Hm I am not sure.
Hg log -G gives
changeset: 56:2b273979d636
│ tag: tip
│ user: Uwe Brauer <oub at mat.ucm.es>
│ date: Wed Aug 10 17:13:45 2022 +0200
│ instability: orphan
│ summary: Set up the exterior files, so that they can be compiled. Solve markup questions
│
∗ changeset: 55:8d95b4026b39
│ user: Uwe Brauer <oub at mat.ucm.es>
│ date: Wed Aug 10 17:12:34 2022 +0200
│ instability: orphan
│ summary: Clarify integration by parts
│
◌ changeset: 54:979c8bfa9c35
│ user: Uwe Brauer <oub at mat.ucm.es>
│ date: Wed Aug 10 17:11:28 2022 +0200
│ obsolete: pruned
│ summary: 2022-08-10 Uwe Brauer <oub at mat.ucm.es>
And
hg log -G --hidden
◌ changeset: 58:4fa31db91243
│ tag: tip
│ parent: 53:3a8a26f0cb50
│ user: Uwe Brauer <oub at mat.ucm.es>
│ date: Wed Aug 10 17:11:28 2022 +0200
│ obsolete: pruned using prune
│ summary: Add a section describing the reference problem
│
│ ◌ changeset: 57:5047f76f5b60
│╱ parent: 53:3a8a26f0cb50
│ user: Uwe Brauer <oub at mat.ucm.es>
│ date: Wed Aug 10 17:11:28 2022 +0200
│ obsolete: amended using uncommit as 58:4fa31db91243
│ summary: Add a section describing the reference problem
│
│ ◍ changeset: 56:2b273979d636
│ │ user: Uwe Brauer <oub at mat.ucm.es>
│ │ date: Wed Aug 10 17:13:45 2022 +0200
│ │ instability: orphan
│ │ summary: Set up the exterior files, so that they can be compiled. Solve markup questions
│ │
│ ∗ changeset: 55:8d95b4026b39
│ │ user: Uwe Brauer <oub at mat.ucm.es>
│ │ date: Wed Aug 10 17:12:34 2022 +0200
│ │ instability: orphan
│ │ summary: Clarify integration by parts
│ │
│ ◌ changeset: 54:979c8bfa9c35
│╱ user: Uwe Brauer <oub at mat.ucm.es>
│ date: Wed Aug 10 17:11:28 2022 +0200
│ obsolete: reworded using histedit as 57:5047f76f5b60
Now I have run
hg evolve
Or
Hg evolve --all
The first graph still looks the same and these changesets
55 and 54 both bother me
My aim was to get a clean graph with nice commit message, now it looks a
bit like a mess and I would like to know whether I could somehow clean
it up
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5671 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20220811/0ae37de0/attachment.p7s>
More information about the Mercurial
mailing list