1017 changeset: 4:88176d361b69 |
1017 changeset: 4:88176d361b69 |
1018 user: test |
1018 user: test |
1019 date: Thu Jan 01 00:00:00 1970 +0000 |
1019 date: Thu Jan 01 00:00:00 1970 +0000 |
1020 summary: add foo, related |
1020 summary: add foo, related |
1021 |
1021 |
|
1022 |
|
1023 Test from/for issue2383 |
|
1024 |
|
1025 $ hg init issue2383 |
|
1026 $ cd issue2383 |
|
1027 |
|
1028 Create a test repo: |
|
1029 |
|
1030 $ echo a > a |
|
1031 $ hg ci -Am0 |
|
1032 adding a |
|
1033 $ echo b > b |
|
1034 $ hg ci -Am1 |
|
1035 adding b |
|
1036 $ hg co 0 |
|
1037 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1038 $ echo b > a |
|
1039 $ hg ci -m2 |
|
1040 created new head |
|
1041 |
|
1042 Merge: |
|
1043 |
|
1044 $ hg merge |
|
1045 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1046 (branch merge, don't forget to commit) |
|
1047 |
|
1048 Make sure there's a file listed in the merge to trigger the bug: |
|
1049 |
|
1050 $ echo c > a |
|
1051 $ hg ci -m3 |
|
1052 |
|
1053 Two files shown here in diff: |
|
1054 |
|
1055 $ hg diff --rev 2:3 |
|
1056 diff -r b09be438c43a -r 8e07aafe1edc a |
|
1057 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1058 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1059 @@ -1,1 +1,1 @@ |
|
1060 -b |
|
1061 +c |
|
1062 diff -r b09be438c43a -r 8e07aafe1edc b |
|
1063 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1064 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1065 @@ -0,0 +1,1 @@ |
|
1066 +b |
|
1067 |
|
1068 Diff here should be the same: |
|
1069 |
|
1070 $ hg log -vpr 3 |
|
1071 changeset: 3:8e07aafe1edc |
|
1072 tag: tip |
|
1073 parent: 2:b09be438c43a |
|
1074 parent: 1:925d80f479bb |
|
1075 user: test |
|
1076 date: Thu Jan 01 00:00:00 1970 +0000 |
|
1077 files: a |
|
1078 description: |
|
1079 3 |
|
1080 |
|
1081 |
|
1082 diff -r b09be438c43a -r 8e07aafe1edc a |
|
1083 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1084 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
1085 @@ -1,1 +1,1 @@ |
|
1086 -b |
|
1087 +c |
|
1088 diff -r b09be438c43a -r 8e07aafe1edc b |
|
1089 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1090 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
1091 @@ -0,0 +1,1 @@ |
|
1092 +b |
|
1093 |
|
1094 $ cd .. |