did evolve+histedit screw up some changesets??

Uwe Brauer oub at mat.ucm.es
Fri Aug 12 05:54:08 UTC 2022




> 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

hg evolve --all --any

and resolving a editing conflict seems to have solved my problem, the
graph shows now no obsolete or orphan changesets anymore



More information about the Mercurial mailing list