[Bug 4046] New: hg diff --git can generate an invalid gitdiff when the working directory has multiple parents

[mercurial-bugs at selenic.com]

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

          Priority: normal
            Bug ID: 4046
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: hg diff --git can generate an invalid gitdiff when the
                    working directory has multiple parents
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: jbjoerk at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.6
         Component: Mercurial
           Product: Mercurial

Asking mercurial to generate a git diff while a merge is in progress can result
in an invalid git-patch file, as a file is listed in 'hg status' as modified
instead of 'Added'.

The problem can be easily reproduced as follows:

hg init
echo "Creating A" >> A; hg add A; hg commit -m "Added file A"
hg up null
echo "Creating B" >> B ; hg add B ;hg commit -m "Added B"
hg up 0
hg merge 1
hg diff -g  #<<-- This should show 'added file', but instead only lists a diff
against /dev/null

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