comparison tests/test-git-import.t @ 12874:bb7bf43b72fb stable

patch: fix copies when patching over uncommitted changed (issue2459)

12873:e1855dee28c1

  $ hg st --copies --change . 
  A binary2
    text2
  R text2

12874:bb7bf43b72fb

  $ hg st --copies --change . 
  A binary2
    text2
  R text2
  $ cd ..

Consecutive import with renames (issue2459)

  $ hg init issue2459
  $ cd issue2459
  $ hg import --no-commit --force - <<EOF
  > diff --git a/a b/a
  > new file mode 100644
  > EOF
  applying patch from stdin
  $ hg import --no-commit --force - <<EOF
  > diff --git a/a b/b
  > rename from a
  > rename to b
  > EOF
  applying patch from stdin
  a has not been committed yet, so no copy data will be stored for b.
  $ hg debugstate
  a   0         -1 unset               b
  $ hg ci -m done
  $ cd ..