search

chrono028 / mercurialeclipse

Automatically exported from code.google.com/p/mercurialeclipse
Other
0 stars 0 forks source link

Conflict merge diff - diff is not refreshed after save #25

Closed GoogleCodeExporter closed 8 years ago

GoogleCodeExporter commented 8 years ago 
What steps will reproduce the problem?
1. Make change in file, save it. Do not commit. Appears as Uncommitted in 
synchronize view.
2. Pull diff that creates conflict for your file (prepare it for repro).
3. Open diff view for file, where your version is in left, pulled version is in 
right.
4. Do some change in your own version. (of course, pulled version cannot be 
changed)
5. Save your version.  

What is the expected output? What do you see instead?
Expected: diff view is refreshed, should show only diffs with saved version.
Instead: diffs are old, have to close diff editor and reopen.

What version of the product are you using? On what operating system?
Windows, Eclipse: Helios, MercurialEclipse 1.7.0 with TortoiseHG executable.

Please provide any additional information below.
Additionally: Mercurial Merge is not showing such conflict. Should it ?

Original issue reported on code.google.com by much.d...@gmail.com on 3 Dec 2010 at 12:32

GoogleCodeExporter commented 8 years ago 
Fixed in 1.8

Original comment by johnpeb@gmail.com on 26 Jul 2011 at 12:46