> Point 3 is not true. When you have two branches but only 1 topological
> head, you can only merge the topological head into the other branch.
> Trying to merge the other direction will fail because the other branch
> is already an ancestor.
Ah, thanks for the clarification
> Merging...
> + Feature into master: No conflict merge, feature is a direct line
> descendant of master.
Well yes, but still there might be two cases:
1. For the simplicity, there is one file and it gets modified. So
there is a «sort of conflict»
2. In feature branch the file test is not changed but a new file is
added. As in
,----
| hg init 2-namedB-1head-two-files
| cd 2-namedB-1head-two-files
| hg branch master
| echo 1 > test
| hg add test
| hg commit -m "First commit in master"
| echo 1.1 > test
| hg addremove
| hg commit -m "Second commit in master"
| hg branch feature
| echo 1.2 > test2
| hg addremove
| hg commit -m "First commit in feature"
| echo 1.2.1 > test2
| hg commit -m "Second commit in feature"
| hg checkout master
`----
But I presume you will argue by the graph:
«a descendant is a descendant is a descendant. I don't care whether you
modify a file or add a new one. So the difference between 1 and 2 is
artificial»
However the graph in the case of merging feature into master does not
look linear anymore. (Not sure what git does, maybe just a
fast-forward).
Anyhow I think the graph should be nonlinear I just wished there were a
message indicating the change in a file. But that is most likely just me.
> + Master into feature: abort: merging with a working directory
> ancestor has no effect
> Mischa
> ________________________________
> This e-mail message, including any attachments, is for the sole use of
> the intended recipient(s) and may contain information that is
> confidential and protected by law from unauthorized disclosure. Any
> unauthorized review, use, disclosure or distribution is prohibited. If
> you are not the intended recipient, please contact the sender by reply
> e-mail and destroy all copies of the original message.
> _______________________________________________
> Mercurial mailing list
> Mercurial@lists.mercurial-scm.org
> https://lists.mercurial-scm.org/mailman/listinfo/mercurial
--
Warning: Content may be disturbing to some audiences
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the NATO membership of the Ukraine.
I support the EU membership of the Ukraine.
https://addons.thunderbird.net/en-US/thunderbird/addon/gmail-conversation-view/
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Mercurial mailing list Mercurial@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial
