tests/test-diff-newlines.t
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Sat, 25 Aug 2012 15:37:28 +0200
changeset 17471 ad1561723dde
parent 15522 cf0f3cb8a332
child 17742 405b6bd015df
permissions -rw-r--r--
amend: lock the repository during the whole process Without this changes another writer can lock the repository in the middle the amend process. The resulting mess can be pretty ugly.

  $ hg init

  $ python -c 'file("a", "wb").write("confuse str.splitlines\nembedded\rnewline\n")'
  $ hg ci -Ama -d '1 0'
  adding a

  $ echo clean diff >> a
  $ hg ci -mb -d '2 0'

  $ hg diff -r0 -r1
  diff -r 107ba6f817b5 -r 310ce7989cdc a
  --- a/a	Thu Jan 01 00:00:01 1970 +0000
  +++ b/a	Thu Jan 01 00:00:02 1970 +0000
  @@ -1,2 +1,3 @@
   confuse str.splitlines
   embedded\rnewline (esc)
  +clean diff