[PATCH 1 of 1] record: allow splitting of hunks by manually editing patches

[Matt Mackall]

On Wed, 2012-03-28 at 19:28 -0500, Matt Mackall wrote:
> On Wed, 2012-02-08 at 08:13 +0000, A. S. Budden wrote:
> > # HG changeset patch
> > # User A. S. Budden <abudden at gmail.com>
> > # Date 1328644441 0
> > # Node ID f63457e6722ba6e2a481ff963d57b98a63d68efc
> > # Parent  878bc4a62a735a1624e9b69c672d5fb5074d4855
> > record: allow splitting of hunks by manually editing patches
> 
> Finally queued this, thanks.

Something odd happening here, any ideas?

--- /home/mpm/hg/tests/test-record.t 
+++ /home/mpm/hg/tests/test-record.t.err 
@@ -1048,8 +1048,8 @@
   record this change to 'editedfile'? [Ynesfdaq?] 
   no changes to record
   $ cat editedfile
-  This change will not be committed
-  This is the second line
+  This change will not be committed\r (esc)
+  This is the second line\r (esc)
   This line has been added
   $ hg cat -r tip editedfile
   This is the first line
@@ -1087,8 +1087,8 @@
   abort: patch failed to apply
   [255]
   $ cat editedfile
-  This change will not be committed
-  This is the second line
+  This change will not be committed\r (esc)
+  This is the second line\r (esc)
   This line has been added
   $ hg cat -r tip editedfile
   This is the first line




-- 
Mathematics is the supreme nostalgia of our time.