hg-git: push -d default seems not to work.
Uwe Brauer
oub at mat.ucm.es
Thu May 11 20:34:18 UTC 2017
[Snip]...
> Latest upstream pulled and updated. Ready to finalize patch for submission.
> $ hg rebase -d . -b feature --collapse
> rebasing 1:8b6e6e26b73c "Feature1"
> rebasing 2:36c3fdd7241e "Feature2"
> merging feature.txt
> $ hg log -G -Tcompact --hidden
> o 4[tip] 71db6f73e391 1970-01-01 00:00 +0000 test
> | Collapsed revision
> |
> @ 3:0 6f6112e52af3 1970-01-01 00:00 +0000 test
> | Master2
> |
> | x 2 36c3fdd7241e 1970-01-01 00:00 +0000 test
> | | Feature2
> | |
> | x 1 8b6e6e26b73c 1970-01-01 00:00 +0000 test
> |/ Feature1
> |
> o 0 fe1cc974d811 1970-01-01 00:00 +0000 test
> Master1
This is really *great*.
With the evolve extension rebase is much more intuitive and convenient, I
would even say usable :-D
> The feature branch isn't contiguous, but so what?
> $ hg log -G -b feature --hidden
> @ changeset: 5:dde9d9d6ae41
> | branch: feature
> ~ tag: tip
> user: test
> date: Thu Jan 01 00:00:00 1970 +0000
> summary: feature3
> x changeset: 2:36c3fdd7241e
> | branch: feature
> | user: test
> | date: Thu Jan 01 00:00:00 1970 +0000
> | summary: Feature2
> |
> x changeset: 1:8b6e6e26b73c
> | branch: feature
> ~ user: test
> date: Thu Jan 01 00:00:00 1970 +0000
> summary: Feature1
Just one thing: suppose I found out that the really correct rev was
2:36c3fdd7241e
I would update to this rev by
hg --hidden touch 2
(And use the (d)uplicate the changeset option)
Yes?
Thanks again I will use your proposal from now on, at least for the
repos I push to (not so sure about my private ones).
Uwe
More information about the Mercurial
mailing list