Bug 2400 - problems importing git binary patches w/ renames
Summary: problems importing git binary patches w/ renames
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: unspecified
Hardware: All All
: normal bug
Assignee: Bugzilla
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-09-26 12:25 UTC by Matt Mackall
Modified: 2012-05-13 04:54 UTC (History)
3 users (show)

See Also:
Python Version: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Matt Mackall 2010-09-26 12:25 UTC
$ 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
  [255]
  $ hg st
  A b
  R a
  ? b.patch
  ? b.rej
Comment 1 HG Bot 2010-09-27 18:00 UTC
Fixed by http://hg.intevation.org/mercurial/crew/rev/77600d697d0e
Patrick Mezard <pmezard@gmail.com>
patch: fix rename text to binary file (issue2400)
Comment 2 Bugzilla 2012-05-12 09:12 UTC

--- Bug imported by bugzilla@serpentine.com 2012-05-12 09:12 EDT  ---

This bug was previously known as _bug_ 2400 at http://mercurial.selenic.com/bts/issue2400