thg issueshttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues2020-06-21T11:05:23Zhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/47261111112020-06-21T11:05:23ZBitbucket Importer111111*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (3.6+20151109). TortoiseHg version (3.6)
** Command:
** CWD: C:\home\wikipedia\src\DropdownMenuHandler
** Encoding: cp1251
** Extens...*Created originally on Bitbucket by Anonymous*
#!python
** Mercurial version (3.6+20151109). TortoiseHg version (3.6)
** Command:
** CWD: C:\home\wikipedia\src\DropdownMenuHandler
** Encoding: cp1251
** Extensions loaded:
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\repotreemodel.pyo", line 429, in _updateItem
File "tortoisehg\hgqt\repotreemodel.pyo", line 424, in _updateBaseNode
File "tortoisehg\util\hglib.pyo", line 133, in repoidnode
File "tortoisehg\util\hglib.pyo", line 120, in _firstchangectx
File "tortoisehg\hgqt\thgrepo.pyo", line 714, in __getitem__
File "mercurial\localrepo.pyo", line 501, in __getitem__
File "mercurial\context.pyo", line 391, in __init__
File "mercurial\repoview.pyo", line 302, in changelog
File "mercurial\localrepo.pyo", line 30, in __get__
File "mercurial\scmutil.pyo", line 1129, in __get__
File "mercurial\localrepo.pyo", line 464, in changelog
File "mercurial\changelog.pyo", line 141, in __init__
File "mercurial\revlog.pyo", line 275, in __init__
RevlogError: index 00changelog.i is corruptedhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/535#1827 Shelve: Traceback and delete of file contents version 2.0.22020-06-21T09:49:59ZBitbucket Importer#1827 Shelve: Traceback and delete of file contents version 2.0.2*Created originally on Bitbucket by Anonymous*
Just from:
https://bitbucket.org/tortoisehg/stable/issue/1827/shelve-traceback-and-delete-of-file
Thanks !
*Created originally on Bitbucket by Anonymous*
Just from:
https://bitbucket.org/tortoisehg/stable/issue/1827/shelve-traceback-and-delete-of-file
Thanks !
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2102.0 - Dir diff gives error2020-06-21T09:43:13ZBitbucket Importer2.0 - Dir diff gives error*Created originally on Bitbucket by [janverley (Jan Verley)](https://bitbucket.org/%7B59961bb1-5d42-4126-8b4d-1015308d1dbc%7D/)*
# I highlight 1 changeset(#130) in the graph: 3 files are moved to another dir in that changeset.
# Right ...*Created originally on Bitbucket by [janverley (Jan Verley)](https://bitbucket.org/%7B59961bb1-5d42-4126-8b4d-1015308d1dbc%7D/)*
# I highlight 1 changeset(#130) in the graph: 3 files are moved to another dir in that changeset.
# Right click: Visual dif...
-> A dialog lists 3 R files and 3 A files = OK
{{{
R dir1/file1.txt
R dir1/file2.txt
R dir1/file3.txt
A dir2/file1.txt
A dir2/file2.txt
A dir2/file3.txt
}}}
# click Directory diff button
-> TortoiseHg Bug Report with this content:
{{{
#!python
** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues
** Mercurial version (1.8). TortoiseHg version (2.0)
** Command: --nofork workbench --listfile C:\DOCUME~1\jve\LOCALS~1\Temp\THG4FC.tmp
** CWD: C:\projects\log4net-1.2.10
** Extensions loaded: fixfrozenexts, convert, fetch, graphlog, highlight, interhg
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)]
** Windows version: (5, 1, 2600, 2, 'Service Pack 3')
** Processor architecture: x86
** Qt-4.7.1 PyQt-4.8.2
TypeError: p1dirdiff() takes exactly 2 arguments (1 given)
}}}
I expected to see the KDiff3 directory comparison dialog:
{{{
between <dir1 after changeset #129>
and <dir2 after changeset #130>
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/2312.0 workbench > Sync > Push Button2020-06-21T09:43:37ZBitbucket Importer2.0 workbench > Sync > Push Button*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues
** Mercurial version (1.8). TortoiseHg version (2.0)
** Command:
** CWD: C:\Windows
** Extension...*Created originally on Bitbucket by Anonymous*
{{{
#!python
** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues
** Mercurial version (1.8). TortoiseHg version (2.0)
** Command:
** CWD: C:\Windows
** Extensions loaded: fixfrozenexts
** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)]
** Windows version: (6, 1, 7600, 2, '')
** Processor architecture: x64
** Qt-4.7.1 PyQt-4.8.2
Traceback (most recent call last):
File "tortoisehg\hgqt\sync.pyo", line 799, in pushclicked
File "tortoisehg\hgqt\sync.pyo", line 564, in run
File "tortoisehg\hgqt\sync.pyo", line 305, in applyTargetOption
AttributeError: 'SyncWidget' object has no attribute 'targetargs'
}}}https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/14632.2.1 for x64 is not available for download2020-06-21T10:09:03ZBitbucket Importer2.2.1 for x64 is not available for download*Created originally on Bitbucket by [legigor (Igor Tamashchuk)](https://bitbucket.org/%7B35a50ce1-6180-47d3-92ec-6dd6a018f7d3%7D/)*
https://bitbucket.org/tortoisehg/thg/downloads/tortoisehg-2.2.1-hg-2.0.1-x64.msi - reports 404*Created originally on Bitbucket by [legigor (Igor Tamashchuk)](https://bitbucket.org/%7B35a50ce1-6180-47d3-92ec-6dd6a018f7d3%7D/)*
https://bitbucket.org/tortoisehg/thg/downloads/tortoisehg-2.2.1-hg-2.0.1-x64.msi - reports 404https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/16072.2.2 x64 bug on Win72020-06-21T10:11:54ZBitbucket Importer2.2.2 x64 bug on Win7*Created originally on Bitbucket by Anonymous*
I found that tortoisehg-2.2.2-hg-2.0.2-x64 cannot correctly work on Win7.
It even fails on simple add and commit.
In the other way the 2.1.4 x64 version works just fine on my PC with Win7.*Created originally on Bitbucket by Anonymous*
I found that tortoisehg-2.2.2-hg-2.0.2-x64 cannot correctly work on Win7.
It even fails on simple add and commit.
In the other way the 2.1.4 x64 version works just fine on my PC with Win7.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/20962.4.3 completely fails to function, rolled back to 2.4.2 works fine2020-06-21T10:21:49ZBitbucket Importer2.4.3 completely fails to function, rolled back to 2.4.2 works fine*Created originally on Bitbucket by Anonymous*
After installing 2.4.3 on Win 7 / 64, i could not perform any HG action. Got an error that says can't import httprepo!
I roll back, and everything is fine.
What is the cause?
*Created originally on Bitbucket by Anonymous*
After installing 2.4.3 on Win 7 / 64, i could not perform any HG action. Got an error that says can't import httprepo!
I roll back, and everything is fine.
What is the cause?
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/45042.8.1 crashes when attempting to hg from CLI or thg2020-06-21T11:00:35ZBitbucket Importer2.8.1 crashes when attempting to hg from CLI or thg*Created originally on Bitbucket by [legalize (Richard)](https://bitbucket.org/%7B66d6fc5c-3c50-488b-8a68-4a9318c8f583%7D/)*
#!python
** Mercurial version (3.8.1). TortoiseHg version (3.8.1)
** Command:
** CWD: c:\d...*Created originally on Bitbucket by [legalize (Richard)](https://bitbucket.org/%7B66d6fc5c-3c50-488b-8a68-4a9318c8f583%7D/)*
#!python
** Mercurial version (3.8.1). TortoiseHg version (3.8.1)
** Command:
** CWD: c:\dev\hexagon\dev
** Encoding: cp1252
** Extensions loaded: convert, strip, mq, purge, record
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 49, in dispatch
File "tortoisehg\hgqt\run.pyo", line 243, in _runcatch
File "tortoisehg\hgqt\run.pyo", line 332, in runcommand
File "tortoisehg\hgqt\run.pyo", line 383, in _runcommand
File "tortoisehg\hgqt\run.pyo", line 337, in checkargs
File "tortoisehg\hgqt\run.pyo", line 331, in <lambda>
File "tortoisehg\hgqt\qtapp.pyo", line 405, in __call__
File "tortoisehg\hgqt\qtapp.pyo", line 469, in _createdialog
File "mercurial\util.pyo", line 1005, in check
File "tortoisehg\hgqt\run.pyo", line 923, in log
File "tortoisehg\hgqt\run.pyo", line 427, in _workbench
File "tortoisehg\hgqt\workbench.pyo", line 668, in showRepo
File "tortoisehg\hgqt\workbench.pyo", line 662, in openRepo
File "tortoisehg\hgqt\repotab.pyo", line 92, in openRepo
File "tortoisehg\hgqt\repotab.pyo", line 322, in _createRepoWidget
File "tortoisehg\hgqt\thgrepo.pyo", line 604, in openRepoAgent
File "tortoisehg\hgqt\thgrepo.pyo", line 42, in repository
File "mercurial\hg.pyo", line 161, in repository
File "mercurial\hg.pyo", line 148, in _peerorrepo
File "mercurial\hg.pyo", line 118, in _peerlookup
File "C:/dev/hgsubversion\hgsubversion\__init__.py", line 187, in _lookup
AttributeError: 'NoneType' object has no attribute 'islocalrepo'
*Attachments:* [bugreport.txt](/uploads/7f77d3762aa3e486f53ff12011f7055b/bugreport.txt)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/25872.8 crash on push/pull to/from remote repository.2020-06-21T10:31:59ZBitbucket Importer2.8 crash on push/pull to/from remote repository.*Created originally on Bitbucket by [StrawMan (Jay Lonnquist)](https://bitbucket.org/%7Bd3ecf9a8-27a1-429a-8794-f9ea2c85b1c3%7D/)*
Windows Vista 32bit.
While attempting to push or pull to/from remote repository via workbench or directl...*Created originally on Bitbucket by [StrawMan (Jay Lonnquist)](https://bitbucket.org/%7Bd3ecf9a8-27a1-429a-8794-f9ea2c85b1c3%7D/)*
Windows Vista 32bit.
While attempting to push or pull to/from remote repository via workbench or directly from sync, application crashes.
Downgrading to 2.7.2 resolves the issue.
I've attached information from Windows Event Viewer.
Apologies to those unable to read Japanese, but that's the locality I'm working from these days:
Also attached Event Viewer generated xml.
**障害が発生しているアプリケーション thgw.exe、バージョン 2.8.0.0、タイム スタンプ 0x4f3f0f2f、障害が発生しているモジュール ntdll.dll、バージョン 6.0.6002.18541、タイム スタンプ 0x4ec3e3d5、例外コード 0xc0000374、障害オフセット 0x000b06b7、 プロセス ID 0x1dc、アプリケーションの開始時刻 0x01ce4b8a20db3115。**
*Attachments:* [2_8_crash.xml](/uploads/c12738d6538b8aa13bab3b48d6bd887c/2_8_crash.xml)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/532432-bit versions not compiled --> needs to remove links2020-06-28T07:19:26ZBitbucket Importer32-bit versions not compiled --> needs to remove links*Created originally on Bitbucket by [Horinius (T.F. SEAK)](https://bitbucket.org/%7B8ce673ba-c08d-4b1e-a8e8-07426f8de946%7D/)*
Looking at https://bitbucket.org/tortoisehg/files/downloads/, it seems like the 32-bit Windows setups are not...*Created originally on Bitbucket by [Horinius (T.F. SEAK)](https://bitbucket.org/%7B8ce673ba-c08d-4b1e-a8e8-07426f8de946%7D/)*
Looking at https://bitbucket.org/tortoisehg/files/downloads/, it seems like the 32-bit Windows setups are not compiled since the last few versions.
Links in https://tortoisehg.bitbucket.io/download/index.html pointing to 32-bit setups should be removed.
(Or retroactively recompiled 32-bit setups?)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/529632-bit Windows link is broken2020-06-28T07:20:54ZBitbucket Importer32-bit Windows link is broken*Created originally on Bitbucket by Anonymous*
https://tortoisehg.bitbucket.io/download/index.html
https://bitbucket.org/tortoisehg/files/downloads/tortoisehg-4.8.1-x86.msi*Created originally on Bitbucket by Anonymous*
https://tortoisehg.bitbucket.io/download/index.html
https://bitbucket.org/tortoisehg/files/downloads/tortoisehg-4.8.1-x86.msihttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/40763.3.2 - THGW crashes if copying to clipboard (Win7 x64)2020-06-21T10:51:28ZBitbucket Importer3.3.2 - THGW crashes if copying to clipboard (Win7 x64)*Created originally on Bitbucket by Anonymous*
If I select any kind of content to the clipboard (using either CTRL-C or context menus), the process seems to crash for me.
For example marking any changeset in the workbench sync tab hi...*Created originally on Bitbucket by Anonymous*
If I select any kind of content to the clipboard (using either CTRL-C or context menus), the process seems to crash for me.
For example marking any changeset in the workbench sync tab history, selecting 'copy hash', or selecting any text in a changeset description, or selecting text in the 'diff' output or doing 'copy path' on a file in a changset all lead to a crash-to-desktop.
The windows 'this program has stopped working' dialogue states the following (I'm sorry for the formatting):
~~~~
Problem Event Name: APPCRASH
Application Name: thgw.exe
Application Version: 3.3.2.0
Application Timestamp: 4918017b
Fault Module Name: QtCore4.dll
Fault Module Version: 4.8.6.0
Fault Module Timestamp: 53ad3c1d
Exception Code: c000001d
Exception Offset: 0000000000126318
OS Version: 6.1.7601.2.1.0.256.48
Locale ID: 3079
Additional Information 1: f80a
Additional Information 2: f80a3dadf9fa9bfa41e4862fb7e9fdcc
Additional Information 3: 0952
Additional Information 4: 09523de1bfa5fe030f2e53b99abc8a9d
~~~~
This is a new problem for me with 3.3.2, the program has been working most reliably before. This is the x64 version on Win7 pro.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/44333.7.1 Issue with "zeroconf" extension2020-06-21T10:58:59ZBitbucket Importer3.7.1 Issue with "zeroconf" extension*Created originally on Bitbucket by [renouve (Gabriel Boulianne)](https://bitbucket.org/%7B306b4930-2892-4faa-9bae-53da83d15cfb%7D/)*
Since i updated to TortoiseHg 3.7.1, i have this error message when i try to pull:
TypeError: confi...*Created originally on Bitbucket by [renouve (Gabriel Boulianne)](https://bitbucket.org/%7B306b4930-2892-4faa-9bae-53da83d15cfb%7D/)*
Since i updated to TortoiseHg 3.7.1, i have this error message when i try to pull:
TypeError: configitems() got an unexpected keyword argument 'ignoresub'
cmdserver: process exited unexpectedly with code 255
I have this error on my Windows 7 machine, but not on my Windows 8.1 machine.
I uninstalled 3.7.1 and reinstalled 3.6.3 and it works.
Thanks,https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/45063.8.1 crashed when starting workbench from the right click.2020-06-21T11:00:37ZBitbucket Importer3.8.1 crashed when starting workbench from the right click.*Created originally on Bitbucket by [fch1993 (changhao fu)](https://bitbucket.org/%7Bddf6c7f6-d205-4c06-80ff-2b2350ade26f%7D/)*
It worked when starting from start menu.
system: windows server 2012 R2.
error message
```
...*Created originally on Bitbucket by [fch1993 (changhao fu)](https://bitbucket.org/%7Bddf6c7f6-d205-4c06-80ff-2b2350ade26f%7D/)*
It worked when starting from start menu.
system: windows server 2012 R2.
error message
```
#!python
** Mercurial version (3.8.1). TortoiseHg version (3.8.1)
** Command: --nofork workbench
** CWD: D:\Source code\x265
** Encoding: cp936
** Extensions loaded: hggit, hgk, highlight, histedit, keyword, largefiles, rebase, record, relink, strip, convert, extdiff, gpg, mq, notify, patchbomb, shelve, eol, hgsubversion, evolve, hgcia, hgcr-gui-qt, acl, blackbox, bugzilla, censor, churn, clonebundles, factotum, mercurial_extension_utils, mercurial_keyring, transplant, win32mbcs, zipdoc, projrc, purge, schemes, share, simplelock, onsub
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\run.pyo", line 49, in dispatch
File "tortoisehg\hgqt\run.pyo", line 243, in _runcatch
File "tortoisehg\hgqt\run.pyo", line 332, in runcommand
File "tortoisehg\hgqt\run.pyo", line 383, in _runcommand
File "tortoisehg\hgqt\run.pyo", line 337, in checkargs
File "tortoisehg\hgqt\run.pyo", line 331, in <lambda>
File "tortoisehg\hgqt\qtapp.pyo", line 405, in __call__
File "tortoisehg\hgqt\qtapp.pyo", line 469, in _createdialog
File "mercurial\util.pyo", line 1005, in check
File "tortoisehg\hgqt\run.pyo", line 923, in log
File "tortoisehg\hgqt\run.pyo", line 427, in _workbench
File "tortoisehg\hgqt\workbench.pyo", line 668, in showRepo
File "tortoisehg\hgqt\workbench.pyo", line 662, in openRepo
File "tortoisehg\hgqt\repotab.pyo", line 92, in openRepo
File "tortoisehg\hgqt\repotab.pyo", line 327, in _createRepoWidget
File "tortoisehg\hgqt\repowidget.pyo", line 70, in __init__
File "tortoisehg\hgqt\repowidget.pyo", line 131, in setupUi
File "tortoisehg\hgqt\revdetails.pyo", line 50, in __init__
File "tortoisehg\hgqt\revdetails.pyo", line 178, in createActions
File "tortoisehg\hgqt\filectxactions.pyo", line 416, in setupCustomToolsMenu
File "tortoisehg\util\hglib.pyo", line 500, in tortoisehgtools
AttributeError: 'ui' object has no attribute 'items'
```
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/36923error hgsubversion : "access to '/rep/memcad/!svn/ver/76421/trunk/src/.proje...2020-06-21T10:43:14ZBitbucket Importer3error hgsubversion : "access to '/rep/memcad/!svn/ver/76421/trunk/src/.project' forbidden", 175013*Created originally on Bitbucket by Anonymous*
The error occurs when trying to push my last modifications on svn via hgsubversion :
#!python
** Mercurial version (2.9.1). TortoiseHg version (2.11.1)
** Command:
** CW...*Created originally on Bitbucket by Anonymous*
The error occurs when trying to push my last modifications on svn via hgsubversion :
#!python
** Mercurial version (2.9.1). TortoiseHg version (2.11.1)
** Command:
** CWD: C:\source\memsplus\trunk_hg_clone\src
** Encoding: cp1252
** Extensions loaded: hgsubversion, rebase, strip, mq
** Python version: 2.7.6 (default, Nov 10 2013, 19:24:24) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.5 PyQt-4.10.3 QScintilla-2.7.2
Traceback (most recent call last):
File "tortoisehg\hgqt\thread.pyo", line 287, in run
File "tortoisehg\util\hglib.pyo", line 711, in dispatch
File "mercurial\dispatch.pyo", line 806, in _dispatch
File "mercurial\dispatch.pyo", line 586, in runcommand
File "mercurial\dispatch.pyo", line 897, in _runcommand
File "mercurial\dispatch.pyo", line 868, in checkargs
File "mercurial\dispatch.pyo", line 803, in <lambda>
File "mercurial\util.pyo", line 511, in check
File "mercurial\extensions.pyo", line 151, in wrap
File "mercurial\util.pyo", line 511, in check
File "hgext\mq.pyo", line 3381, in mqcommand
File "mercurial\util.pyo", line 511, in check
File "mercurial\extensions.pyo", line 151, in wrap
File "mercurial\util.pyo", line 511, in check
File "C:/hgsubversion\hgsubversion\wrappers.py", line 634, in generic
File "mercurial\util.pyo", line 511, in check
File "mercurial\commands.pyo", line 4732, in push
File "C:/hgsubversion\hgsubversion\svnrepo.py", line 77, in wrapper
File "C:/hgsubversion\hgsubversion\svnrepo.py", line 96, in push
File "C:/hgsubversion\hgsubversion\wrappers.py", line 259, in push
File "C:/hgsubversion\hgsubversion\pushmod.py", line 201, in commit
File "C:/hgsubversion\hgsubversion\svnwrap\svn_swig_wrapper.py", line 449, in commit
File "libsvn\delta.pyo", line 498, in svn_delta_path_driver
File "C:/hgsubversion\hgsubversion\svnwrap\svn_swig_wrapper.py", line 418, in driver_cb
File "libsvn\delta.pyo", line 438, in open_file
File "libsvn\delta.pyo", line 634, in svn_delta_editor_invoke_open_file
SubversionException: ("access to '/rep/memcad/!svn/ver/76421/trunk/src/.project' forbidden", 175013)
It was working for the previous push the same dayhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/23323rd party merge tool2020-06-21T10:26:34ZBitbucket Importer3rd party merge tool*Created originally on Bitbucket by Anonymous*
Hello!
I use p4merge merge tool from perforce and I found that even when there is no conflicts during merge, I am asked to merge files. My assumption is that this happens only for files ...*Created originally on Bitbucket by Anonymous*
Hello!
I use p4merge merge tool from perforce and I found that even when there is no conflicts during merge, I am asked to merge files. My assumption is that this happens only for files for which default merge tool (kdiff3) reports conflicts.
Best,
Dmitriyhttps://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/19193-Way Diff broken for Beyond Compare2020-07-10T11:33:56ZBitbucket Importer3-Way Diff broken for Beyond Compare*Created originally on Bitbucket by [pcalin (Calin Pirtea)](https://bitbucket.org/%7B4a8fb5da-0644-4a2a-b4b4-28c990d57f19%7D/)*
In the case of a merge, after the file was merged, using the 3-Way Diff to review the result in Resolved Con...*Created originally on Bitbucket by [pcalin (Calin Pirtea)](https://bitbucket.org/%7B4a8fb5da-0644-4a2a-b4b4-28c990d57f19%7D/)*
In the case of a merge, after the file was merged, using the 3-Way Diff to review the result in Resolved Conflicts is invoking Beyond Compare with the wrong parameters causing serious confusion for the person reviewing the merge.
It would be great if we would see the same files involved in the merge where the result is at the bottom.
This bug lead us to some serious merge issues.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/46423-way diff crash when manually resolving merge conflicts2020-06-21T11:03:35ZBitbucket Importer3-way diff crash when manually resolving merge conflicts*Created originally on Bitbucket by [matteosistisette (matteo sisti sette)](https://bitbucket.org/%7B9fa605ad-375e-45d8-bd81-71c0b4ff11b4%7D/)*
I was doing a merge and there were conflicts to be resolved.
I chose "tool resolve".
Thi...*Created originally on Bitbucket by [matteosistisette (matteo sisti sette)](https://bitbucket.org/%7B9fa605ad-375e-45d8-bd81-71c0b4ff11b4%7D/)*
I was doing a merge and there were conflicts to be resolved.
I chose "tool resolve".
This automatically opened the 3-way diff tool (I think this behavior has changed: before it would show you the list of automatically resolved files and you would have to manually select each of them and click on "3-way diff"), for one file at a time one after the other.
After editing a few files, (each time, by closing the 3-way diff window, a new one would pop up with the following file with conflicts), at the N-th one, something crashed. See the attachment.
This is very critical: you definitely don't want stuff to crash just when you are manually resolving merge conflicts.
*Attachments:* [Screenshot_from_2016-12-12_18-48-30](/uploads/2eaca77dce50446c43289be6c8b4bf65/Screenshot_from_2016-12-12_18-48-30.png)https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/13853-way merge behaviour differs between dialogs2020-06-21T10:07:23ZBitbucket Importer3-way merge behaviour differs between dialogs*Created originally on Bitbucket by [kisielk (Kamil Kisiel)](https://bitbucket.org/%7B0e6175ba-73f9-4d5b-9bbb-812aedb53a90%7D/)*
I'm using diffuse as a merge tool with the following configuration:
{{{
[merge-tools]
diffuse.executab...*Created originally on Bitbucket by [kisielk (Kamil Kisiel)](https://bitbucket.org/%7B0e6175ba-73f9-4d5b-9bbb-812aedb53a90%7D/)*
I'm using diffuse as a merge tool with the following configuration:
{{{
[merge-tools]
diffuse.executable = diffuse
diffuse.args=$local $base $other
diffuse.gui=True
diffuse.diffargs=$parent $child
diffuse.diff3args=$parent1 $child $parent2
diffuse.dirdiff=False
}}}
This is based on the example in the thg source repository.
When performing a merge between two revisions and going in to conflict resolution, the order of the files in diffuses seems to be: local, parent1, parent2. However, if I cancel out of the merge resolution dialog and leave the changes unresolved, then double-click an unresolved file, it appears that diffuse opens up the files in the order parent1, local, parent2.
The only explanation I can think of is that one of them uses diffuse.args as the arguments whereas the other uses diffuse.diff3args. In any case, it's extremely confusing.https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/18213-way visual diff picks wrong file from copied files2020-06-21T10:16:05ZBitbucket Importer3-way visual diff picks wrong file from copied files*Created originally on Bitbucket by [mischab1](https://bitbucket.org/%7Bb68ff81e-35b6-4ca5-8946-1d02ea3504c7%7D/)*
In TortoiseHg 2.3.1 with Mercurial 2.1.1, when merging changes forward from an original file foo to a copied file foobar,...*Created originally on Bitbucket by [mischab1](https://bitbucket.org/%7Bb68ff81e-35b6-4ca5-8946-1d02ea3504c7%7D/)*
In TortoiseHg 2.3.1 with Mercurial 2.1.1, when merging changes forward from an original file foo to a copied file foobar, and using the Resolve Conflicts dialog box, If you click **3-Way Diff** or **Diff to Local** for the resolved foobar file, it compares the merged foobar file to the local foo file instead of the local foobar.
This is very confusing if Tool Resolve merged all changes automatically and you want to verify it did the correct thing. Instead of showing the few changes that were copied forward in this merge, it shows all changes that have happened to foobar since it was copied from foo.
I've attached a batch file that creates an example repository to see this in action. After running the batch file, do the following in TortoiseHg.
1. Right-click the tip of default and select **Merge with local...**.
2. Make sure both options are unchecked and click **Next**
3. Click the **Resolved** link to open the Resolve Conflicts dialog box.
4. Select foobar and click **Tool Resolve**.
5. The file is automatically resolved and moves to the Resolved Conflicts area. Select the file and click **3-Way Diff**.
6. Look at the confusing diff. Because it is showing the local foo instead of the local foobar, you can't tell that the only thing the merge changed is the addition of "first" in the first line.
*Attachments:* [hgbug.bat](/uploads/0a58d576e6ed6e765eefbc76a0643d3e/hgbug.bat)