[issue2400] problems importing git binary patches w/ renames

Matt Mackall bugs at mercurial.selenic.com
Sun Sep 26 13:25:07 CDT 2010

New submission from Matt Mackall <mpm at selenic.com>:

$ hg init
  $ echo a > a
  $ hg ci -Am0
  adding a
  $ hg mv a b
  $ echo b >> b

Comment out this line to make this test succeed:

  $ python -c 'open("b", "a").write("\0")'
  $ hg ci -m1
  $ hg export -g tip > b.patch

Try to apply our patch:

  $ hg co 0
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ hg import --no-commit b.patch
  applying b.patch
  file b already exists
  1 out of 1 hunks FAILED -- saving rejects to file b.rej
  abort: patch failed to apply
  $ hg st
  A b
  R a
  ? b.patch
  ? b.rej

messages: 13746
nosy: mpm
priority: bug
status: unread
title: problems importing git binary patches w/ renames

Mercurial issue tracker <bugs at mercurial.selenic.com>

More information about the Mercurial-devel mailing list