[Bug 3638] New: resolve command doesn't save progress when interrupted

bugzilla-daemon at bz.selenic.com bugzilla-daemon at bz.selenic.com
Tue Sep 25 12:42:48 CDT 2012


http://bz.selenic.com/show_bug.cgi?id=3638

          Priority: normal
            Bug ID: 3638
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: resolve command doesn't save progress when interrupted
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: voidwrk at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.2.2
         Component: Mercurial
           Product: Mercurial

Initial state:

$ hg resolve -l                                                                
                                                          U t1.txt
U t2.txt

Steps to reproduce:

1. Start the resolve
$ hg resolve -a

2. Resolve a first file conflict (e.g., with an external merge tool like
kdiff3)
3. Interrupt the tool on resolving the second file

Expected result:
$ hg resolve -l                                                                
                                                          R t1.txt
U t2.txt

Actual result:

$ hg resolve -l                                                                
                                                          U t1.txt
U t2.txt

I'll provide a patch to the mailing list that fixes the problem

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list