Hi,
I am attempting to fix https://bitbucket.org/tortoisehg/thg...arent-displays
Ideally, I want to display two panels on top (the two revisions being merged) and the merged result at the bottom. Does BC3 offer such a UI combination? (I assume not)
Assuming this was not possible, I tried implementing the following:
Top left panel: first revision
Top right panel: second revision
Top center panel: merged revision
Bottom (wide) panel: merged revision
In other words, I wanted the bottom (wide) panel to match the top center panel. I used the following command line:
BCompare.exe first.txt second.txt merged.txt merged.txt
Unfortunately, the bottom (wide) panel still contains a different value than the top-center panel. It seems the bottom panel always contains the result of BC3 auto-merge with annotated conflicts.
Seeing as we're displaying a read-only 3-way merge where the merge has already taken place, it is confusing for the bottom panel to show a merge that never took place. Users get confused thinking this is what the merge actually looked like. Is it possible to override this behavior?
Thank you,
Gili
I am attempting to fix https://bitbucket.org/tortoisehg/thg...arent-displays
Ideally, I want to display two panels on top (the two revisions being merged) and the merged result at the bottom. Does BC3 offer such a UI combination? (I assume not)
Assuming this was not possible, I tried implementing the following:
Top left panel: first revision
Top right panel: second revision
Top center panel: merged revision
Bottom (wide) panel: merged revision
In other words, I wanted the bottom (wide) panel to match the top center panel. I used the following command line:
BCompare.exe first.txt second.txt merged.txt merged.txt
Unfortunately, the bottom (wide) panel still contains a different value than the top-center panel. It seems the bottom panel always contains the result of BC3 auto-merge with annotated conflicts.
Seeing as we're displaying a read-only 3-way merge where the merge has already taken place, it is confusing for the bottom panel to show a merge that never took place. Users get confused thinking this is what the merge actually looked like. Is it possible to override this behavior?
Thank you,
Gili
Comment