Show More
@@ -863,7 +863,7 b' class header(object):' | |||||
863 | diff_re = re.compile('diff -r .* (.*)$') |
|
863 | diff_re = re.compile('diff -r .* (.*)$') | |
864 | allhunks_re = re.compile('(?:index|deleted file) ') |
|
864 | allhunks_re = re.compile('(?:index|deleted file) ') | |
865 | pretty_re = re.compile('(?:new file|deleted file) ') |
|
865 | pretty_re = re.compile('(?:new file|deleted file) ') | |
866 | special_re = re.compile('(?:index|deleted|copy|rename) ') |
|
866 | special_re = re.compile('(?:index|deleted|copy|rename|new mode) ') | |
867 | newfile_re = re.compile('(?:new file)') |
|
867 | newfile_re = re.compile('(?:new file)') | |
868 |
|
868 | |||
869 | def __init__(self, header): |
|
869 | def __init__(self, header): |
@@ -732,30 +732,33 b' Testing the case in split when commiting' | |||||
732 |
|
732 | |||
733 |
|
733 | |||
734 | #if no-windows |
|
734 | #if no-windows | |
735 | $ printf 'y\ny\ny\n' | hg split |
|
735 | $ cat > $TESTTMP/messages <<EOF | |
736 | diff --git a/foo b/foo |
|
736 | > split 1 | |
737 | old mode 100644 |
|
737 | > EOF | |
738 | new mode 100755 |
|
738 | $ printf 'y\n' | hg split | |
739 | examine changes to 'foo'? [Ynesfdaq?] y |
|
|||
740 |
|
||||
741 | no changes to record |
|
|||
742 | diff --git a/foo b/foo |
|
739 | diff --git a/foo b/foo | |
743 | old mode 100644 |
|
740 | old mode 100644 | |
744 | new mode 100755 |
|
741 | new mode 100755 | |
745 | examine changes to 'foo'? [Ynesfdaq?] y |
|
742 | examine changes to 'foo'? [Ynesfdaq?] y | |
746 |
|
743 | |||
747 | no changes to record |
|
744 | EDITOR: HG: Splitting 3a2125f0f4cb. Write commit message for the first split changeset. | |
748 | diff --git a/foo b/foo |
|
745 | EDITOR: make executable | |
749 | old mode 100644 |
|
746 | EDITOR: | |
750 | new mode 100755 |
|
747 | EDITOR: | |
751 | examine changes to 'foo'? [Ynesfdaq?] y |
|
748 | EDITOR: HG: Enter commit message. Lines beginning with 'HG:' are removed. | |
|
749 | EDITOR: HG: Leave message empty to abort commit. | |||
|
750 | EDITOR: HG: -- | |||
|
751 | EDITOR: HG: user: test | |||
|
752 | EDITOR: HG: branch 'default' | |||
|
753 | EDITOR: HG: changed foo | |||
|
754 | created new head | |||
|
755 | saved backup bundle to $TESTTMP/issue5864/.hg/strip-backup/3a2125f0f4cb-629e4432-split.hg (obsstore-off !) | |||
|
756 | ||||
|
757 | $ hg log -G -T "{node|short} {desc}\n" | |||
|
758 | @ b154670c87da split 1 | |||
|
759 | | | |||
|
760 | o 51f273a58d82 initial | |||
752 |
|
761 | |||
753 | no changes to record |
|
|||
754 | diff --git a/foo b/foo |
|
|||
755 | old mode 100644 |
|
|||
756 | new mode 100755 |
|
|||
757 | examine changes to 'foo'? [Ynesfdaq?] abort: response expected |
|
|||
758 | [255] |
|
|||
759 | #else |
|
762 | #else | |
760 |
|
763 | |||
761 | TODO: Fix this on Windows. See issue 2020 and 5883 |
|
764 | TODO: Fix this on Windows. See issue 2020 and 5883 |
General Comments 0
You need to be logged in to leave comments.
Login now