equal
deleted
inserted
replaced
998 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
998 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
999 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
999 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
1000 HG: @@ -0,0 +1,1 @@ |
1000 HG: @@ -0,0 +1,1 @@ |
1001 HG: +y |
1001 HG: +y |
1002 |
1002 |
|
1003 $ echo cccc >> cc |
|
1004 $ hg status -amr |
|
1005 M cc |
|
1006 $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc |
|
1007 cc should be excluded |
|
1008 |
|
1009 HG: M: |
|
1010 HG: A: foo y |
|
1011 HG: R: a x |
|
1012 HG: diff -r 6de0c1bde1c8 a |
|
1013 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1014 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1015 HG: @@ -1,2 +0,0 @@ |
|
1016 HG: -a |
|
1017 HG: -a |
|
1018 HG: diff -r 6de0c1bde1c8 foo |
|
1019 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1020 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
1021 HG: @@ -0,0 +1,1 @@ |
|
1022 HG: +foo |
|
1023 HG: diff -r 6de0c1bde1c8 x |
|
1024 HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 |
|
1025 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1026 HG: @@ -1,1 +0,0 @@ |
|
1027 HG: -x |
|
1028 HG: diff -r 6de0c1bde1c8 y |
|
1029 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1030 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
|
1031 HG: @@ -0,0 +1,1 @@ |
|
1032 HG: +y |
|
1033 |
1003 Check for issue4405 |
1034 Check for issue4405 |
1004 ------------------- |
1035 ------------------- |
1005 |
1036 |
1006 Setup the repo with a file that gets moved in a second commit. |
1037 Setup the repo with a file that gets moved in a second commit. |
1007 $ hg init repo |
1038 $ hg init repo |