Mercurial > hg > mercurial-source

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: fix copies when patching over uncommitted changed (issue2459)
author Patrick Mezard <pmezard@gmail.com>
date Thu, 28 Oct 2010 21:25:53 +0200
parents b96de59a2c39
children 7439ea4146f8
comparison
equal deleted inserted replaced
12873:e1855dee28c1 12874:bb7bf43b72fb
359 359
360 $ hg st --copies --change . 360 $ hg st --copies --change .
361 A binary2 361 A binary2
362 text2 362 text2
363 R text2 363 R text2
364 364 $ cd ..
365
366 Consecutive import with renames (issue2459)
367
368 $ hg init issue2459
369 $ cd issue2459
370 $ hg import --no-commit --force - <<EOF
371 > diff --git a/a b/a
372 > new file mode 100644
373 > EOF
374 applying patch from stdin
375 $ hg import --no-commit --force - <<EOF
376 > diff --git a/a b/b
377 > rename from a
378 > rename to b
379 > EOF
380 applying patch from stdin
381 a has not been committed yet, so no copy data will be stored for b.
382 $ hg debugstate
383 a 0 -1 unset b
384 $ hg ci -m done
385 $ cd ..