>>> "BMJ" == Becker, Mischa J <mischa.bec...@kroger.com> writes:
> The most likely case is that the merge parent has those lines. They > weren’t added by 1704, 1703, or one of its ancestors, deleted them. As > a result, the only change visible to the merge is the deletion. I am still confused I run hg annotate in 1704 to find out that the text was added in 1699 Then hg debugancestor 1703 1704 Shows me that 1699:5c2a1978c025d22134 So 1699 is the ancestor of both and has the text in it, so if I merge 1703 into 1704 or the other way around Why does the text disappear, then?? That puzzles me very much, an I have to rethink by understanding of merging. -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine.
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Mercurial mailing list Mercurial@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial
