git-->hg: Estimating the likeliness of a change leading to major conflicts

Uwe Brauer oub at mat.ucm.es
Mon Nov 23 08:17:36 UTC 2020


Hi 

Some days ago Tassilo Horn posted on the git mailing list the following
question 

,----
| Is there a branch which
| 
|  a) hasn't been merged into the current branch yet,
|  b) has a common predecessor with the current branch,
|  c) changed file XXX in a significant way (expressed maybe as a ratio of
|     changed lines when diffing that file on the other branch and the
|     current one and the number of lines in the file).
`----

The full article is available 
https://groups.google.com/d/msgid/git-users/87eekseyal.fsf%40gnu.org.

Some days later he posted a shell script which I attach.

I am curious could this be «translated» to mercurial?

Two essential commands are

git branch --remote --list --no-merged HEAD 

`git log -n1 --since='3 months' $branch`

Which I think would be in mercurial:

hg log -r tip -T '{count(revset("head()"))}\n' \

`hg log  -r"date('-90')"' $branch`

But my script did not work, I attach both, maybe somebody finds it
useful and tries to make it work?

Regards

Uwe Brauer 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: th-check-conflict.sh
Type: text/x-sh
Size: 954 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial/attachments/20201123/3d07219a/attachment.sh>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ub-check-conflicts.sh
Type: text/x-sh
Size: 948 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial/attachments/20201123/3d07219a/attachment-0001.sh>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5673 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial/attachments/20201123/3d07219a/attachment.bin>


More information about the Mercurial mailing list