OpenJDK (Java) migrating from Mercurial?
Uwe Brauer
oub at mat.ucm.es
Mon Nov 18 11:22:38 UTC 2019
> Craig Ozancin <c.ozancin at gmail.com> writes:
> I think this is also a problem, though. As someone who is a big hg fan
> only recently, I struggled for awhile to figure out how to do branching
> in hg and I probably still don't do it very well. I, almost
> exclusively, use bookmarks. And because there are so many options out
> there, there is also no definitive "here is how to do it" document. The
> technical information is also conflicting. Are hg branches too
> expensive for git-like branching? Some say yes, some say no. And
> topics? Those don't seem super well documented so I don't even know how
> to use them.
> I think hg is a superior product overall, but I think the branching
> situation is not a point of strength.
I strongly disagree.
The git branching model might be flexible but I don't understand the
graph with git branches, that is I don't understand which changeset
belongs to which branch for changeset which are committed some time ago.
With named branches this is different, I always know which changeset is
in which branch.
I use named branches for long lived branches, but I also use them for a
short fix, relying on the evolve extension.
Here is what I do.
hg branch shortfix
hack, commit, hack, commit
hg up default
hg rebase -d . -b shortfix --collapse
The branch is still there but hidden.
hg log -G --hidden
Shows me the hidden named branch. The good point is that I can again use
the term shortfix in a different situation and there is no conflict with
the hidden branch. Works like charm.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5025 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20191118/bcc205b1/attachment.p7s>
More information about the Mercurial
mailing list