how to solve a conflicting editing for someone (using backout?), but cannot merge since there is only one head

[Pierre-Yves David]

If you want to cancel the backout, you need to backout the backout.

On 4/6/23 17:38, Uwe Brauer wrote:
> Hi
>
> Here is the situation. Both users have cloned from server
> User1 adds a change set (and a conflict) and  his graph looks like
>
>
> ◍   changeset:     6:8d6ce4461712
> │   Branch:        default
> │    Author:        Uwe Brauer <oub at mat.ucm.es>
> │    Date:          Thu, 06 Apr 2023 17:17:37 +0200
> │    Phase:         public
> │    Summary:       Conflicting edit first line Uwe
> │
> ○  changeset:     5:efbf9d1c253b
> │  Branch:        default
> │  Author:        Uwe Brauer <oub at mat.ucm.es>
> │  Date:          Thu, 06 Apr 2023 17:16:37 +0200
> │  Phase:         public
> │  Summary:       5: Six
>
> User2
>
>
> ◍    changeset:     6:6c83e932468f
> │    Branch:        default
> │    Author:        Elena <elena at somwhere.es>
> │    Date:          Thu, 06 Apr 2023 17:18:47 +0200
> │    Phase:         public
> │    Summary:       Conflicting edit Elena
> │
> ○  changeset:     5:efbf9d1c253b
> │  Branch:        default
> │  Author:        Uwe Brauer <oub at mat.ucm.es>
> │  Date:          Thu, 06 Apr 2023 17:16:37 +0200
> │  Phase:         public
> │  Summary:       5: Six
>
> Now
>
>      1. User1 pushes first.
>
>      2. User2 wants to push, can't try to pull and merge (or fetch) but since there is a conflict, merge is aborted.
>
>      3. User1 then backout his change set and pushed again.
>
>      4. User2 can now pull and merge successfully, and push again.
>
>      5. User1 pulls and tries to merge the conflicting editing.
>
> However
>
> The graph for user1 looks now:
>
>
> ○  changeset:     9:61f9d9f6da29
> │╲   tag:           tip
> │ │  Remote_Branch: default/default
> │ │  Branch:        default
> │ │  Author:        Uwe Brauer <oub at mat.ucm.es>
> │ │  Date:          Thu, 06 Apr 2023 17:22:10 +0200
> │ │  Phase:         draft
> │ │  Summary:       Automated merge with file:///home/oub/HGTest/Backout/Test/Server
> │ │
> │ ○  changeset:     8:6c83e932468f
> │ │  Branch:        default
> │ │  Author:        Elena <elena at somewhere.es>
> │ │  Date:          Thu, 06 Apr 2023 17:18:47 +0200
> │ │  Phase:         public
> │ │  Summary:       Conflicting edit Elena
> │ │
> ○ │  changeset:     7:5b1c81ac4fe4
> │ │  Branch:        default
> │ │  Author:        Uwe Brauer <oub at mat.ucm.es>
> │ │  Date:          Thu, 06 Apr 2023 17:20:08 +0200
> │ │  Phase:         public
> │ │  Summary:       Backed out changeset 8d6ce4461712: Now Elena might push
> │ │
> ◍ │  changeset:     6:8d6ce4461712
> │╱   Branch:        default
> │    Author:        Uwe Brauer <oub at mat.ucm.es>
> │    Date:          Thu, 06 Apr 2023 17:17:37 +0200
> │    Phase:         public
> │    Summary:       Conflicting edit first line Uwe
>
>
> The he wants to merge change set 9 with 6, but that is rejected since it
> is on the same branch and there is no head.
>
> Any ideas how to proceed?
>
> No topics are set (otherwise I could use
> topic.linear-merge = allow-from-bare-branch
>
> Shall I create new branch using evolve, seems quite heavy?
>
>
>
> Thanks
>
>
>
>
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at lists.mercurial-scm.org
> https://lists.mercurial-scm.org/mailman/listinfo/mercurial

-- 
Pierre-Yves David