feature proposal: named branches without named branches
Arne Babenhauserheide
arne_bab at web.de
Fri Nov 18 14:51:26 UTC 2016
Uwe Brauer writes:
> > Uwe Brauer writes:
>
>
> > Same for me (though I don’t have much hope given the history I have with felipec).
>
> Aha, so you know him already, he pops up regularly in google on the top
> list concerning git mercurial questions, but he seems to be a bit militant.
Yes.
> > Especially the following by others is a huge step forward (and past
> > git): You can actually rewrite history collaboratively as long as you
> > did not publish it yet.
>
> Ok so here is the million dollar question: suppose you have already
> pushed to some server so the phase is public,
>
> Would the following work?
> I change phase back to private
> I apply the evolve commands you wrote below and then
> push --force
> so that the repo gets synchronized my local one
You’d have to change the phase on the server to draft, then it would
work. That’s possible in many settings.
> (and all the users who already pulled meanwhile are well they are bit annoyed.._
That’s why you have to do the change on the server instead of just
force-pushing a change which breaks others repos.
> > You simply amend the changeset which initially set the branch and then
> > evolve the history:
>
>
> > The result is this:
>
> > @ changeset: 5:a514636a4ef4
> > | branch: stable
> > | tag: tip
> > | user: Arne Babenhauserheide <bab at draketo.de>
> > | date: Thu Nov 17 23:51:03 2016 +0100
> > | summary: stable2
> > |
> > o changeset: 4:15b134eb1bcd
> > | branch: stable
> > | parent: 0:4c3d391118f6
> > | user: Arne Babenhauserheide <bab at draketo.de>
> > | date: Thu Nov 17 23:50:57 2016 +0100
> > | summary: stable
> > |
> > o changeset: 0:4c3d391118f6
> > user: Arne Babenhauserheide <bab at draketo.de>
> > date: Thu Nov 17 23:50:38 2016 +0100
> > summary: 1
>
> Very cool, thanks, I will definitely need that.
Nice!
Happy to help ☺
Best wishes,
Arne
--
Unpolitisch sein
heißt politisch sein
ohne es zu merken
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20161118/f9086f79/attachment.asc>
More information about the Mercurial
mailing list