Ugly merges when "Check for incoming" is used

Issue #1611 wontfix
Marcin Wisnicki
created an issue

When "check for incoming changes" is used, THG downloads changes to bundle in %TEMP%. Pressing Accept has unfortunate effect of recording this path as merge source in log message.

Would it be possible to generate merge message that refers to original repository instead of local bundle file ?

Comments (4)

  1. Marcin Wisnicki reporter

    I haven't used HG for a while but as far as I remember that bundle file is generated by THG (from a known url) when user clicks "Check for incoming changes", so THG should know this url later when generating commit message, shouldn't it ?

  2. Yuya Nishihara

    that bundle file is generated by THG

    Yes.

    THG should know this url later when generating commit message

    THG knows it, but THG never make the automated merge commit. I guess it is done by fetch extension or your hook scripts.

  3. Marcin Wisnicki reporter

    I didn't have hook scripts so I guess that leaves fetch extension. But the whole process was GUI driven and as noted above, it was THG that asked whether to merge the commits and I assumed that THG is in control of it.

  4. Log in to comment