Mercurial > evolve
comparison tests/test-evolve-obshistory.t @ 3400:6d345d7ca682
obslog: add header to the changeset description diff
This patch adds `diff -r <hash> -r <hash> <filename>` header to the output of
the changeset description diff which is shown using the --patch flag of obslog
command.
This fixes the label/color issue for description diff also.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 11 Jan 2018 17:11:10 +0530 |
parents | 4adf46158b9b |
children | 39112fd4d5ed |
comparison
equal
deleted
inserted
replaced
3399:4adf46158b9b | 3400:6d345d7ca682 |
---|---|
54 $ hg obslog --patch 4ae3a4151de9 | 54 $ hg obslog --patch 4ae3a4151de9 |
55 @ 4ae3a4151de9 (2) A1 | 55 @ 4ae3a4151de9 (2) A1 |
56 | | 56 | |
57 x 471f378eab4c (1) A0 | 57 x 471f378eab4c (1) A0 |
58 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) | 58 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
59 --- a/471f378eab4c-changeset-description | 59 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
60 +++ b/4ae3a4151de9-changeset-description | 60 --- a/changeset-description |
61 +++ b/changeset-description | |
61 @@ -1,1 +1,3 @@ | 62 @@ -1,1 +1,3 @@ |
62 -A0 | 63 -A0 |
63 +A1 | 64 +A1 |
64 + | 65 + |
65 +Better commit message | 66 +Better commit message |
75 $ hg obslog --patch --color debug | 76 $ hg obslog --patch --color debug |
76 @ [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1] | 77 @ [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1] |
77 | | 78 | |
78 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] | 79 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
79 [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] | 80 [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)] |
80 [diff.deleted|--- a/471f378eab4c-changeset-description] | 81 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description] |
81 [diff.inserted|+++ b/4ae3a4151de9-changeset-description] | 82 [diff.file_a|--- a/changeset-description] |
83 [diff.file_b|+++ b/changeset-description] | |
82 [diff.hunk|@@ -1,1 +1,3 @@] | 84 [diff.hunk|@@ -1,1 +1,3 @@] |
83 [diff.deleted|-A0] | 85 [diff.deleted|-A0] |
84 [diff.inserted|+A1] | 86 [diff.inserted|+A1] |
85 [diff.inserted|+] | 87 [diff.inserted|+] |
86 [diff.inserted|+Better commit message] | 88 [diff.inserted|+Better commit message] |
96 | 98 |
97 $ hg obslog --no-graph --patch 4ae3a4151de9 | 99 $ hg obslog --no-graph --patch 4ae3a4151de9 |
98 4ae3a4151de9 (2) A1 | 100 4ae3a4151de9 (2) A1 |
99 471f378eab4c (1) A0 | 101 471f378eab4c (1) A0 |
100 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) | 102 rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) |
101 --- a/471f378eab4c-changeset-description | 103 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
102 +++ b/4ae3a4151de9-changeset-description | 104 --- a/changeset-description |
105 +++ b/changeset-description | |
103 @@ -1,1 +1,3 @@ | 106 @@ -1,1 +1,3 @@ |
104 -A0 | 107 -A0 |
105 +A1 | 108 +A1 |
106 + | 109 + |
107 +Better commit message | 110 +Better commit message |
108 | 111 |
109 diff -r 471f378eab4c -r 4ae3a4151de9 A0 | 112 diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
110 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 | 113 --- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
111 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 | 114 +++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
112 @@ -1,1 +1,2 @@ | 115 @@ -1,1 +1,2 @@ |
113 A0 | 116 A0 |
151 } | 154 } |
152 ] | 155 ] |
153 $ hg obslog --hidden --patch 471f378eab4c | 156 $ hg obslog --hidden --patch 471f378eab4c |
154 x 471f378eab4c (1) A0 | 157 x 471f378eab4c (1) A0 |
155 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) | 158 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
156 --- a/471f378eab4c-changeset-description | 159 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
157 +++ b/4ae3a4151de9-changeset-description | 160 --- a/changeset-description |
161 +++ b/changeset-description | |
158 @@ -1,1 +1,3 @@ | 162 @@ -1,1 +1,3 @@ |
159 -A0 | 163 -A0 |
160 +A1 | 164 +A1 |
161 + | 165 + |
162 +Better commit message | 166 +Better commit message |
842 Check that debugobshistory on the first folded revision show only | 846 Check that debugobshistory on the first folded revision show only |
843 the revision with the target | 847 the revision with the target |
844 $ hg obslog --hidden 471f378eab4c --patch | 848 $ hg obslog --hidden 471f378eab4c --patch |
845 x 471f378eab4c (1) A0 | 849 x 471f378eab4c (1) A0 |
846 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | 850 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
847 --- a/471f378eab4c-changeset-description | 851 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
848 +++ b/eb5a0daa2192-changeset-description | 852 --- a/changeset-description |
853 +++ b/changeset-description | |
849 @@ -1,1 +1,1 @@ | 854 @@ -1,1 +1,1 @@ |
850 -A0 | 855 -A0 |
851 +C0 | 856 +C0 |
852 | 857 |
853 diff -r 471f378eab4c -r eb5a0daa2192 B0 | 858 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
865 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | 870 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
866 | (No patch available, changesets rebased) | 871 | (No patch available, changesets rebased) |
867 | | 872 | |
868 x 471f378eab4c (1) A0 | 873 x 471f378eab4c (1) A0 |
869 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | 874 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
870 --- a/471f378eab4c-changeset-description | 875 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
871 +++ b/eb5a0daa2192-changeset-description | 876 --- a/changeset-description |
877 +++ b/changeset-description | |
872 @@ -1,1 +1,1 @@ | 878 @@ -1,1 +1,1 @@ |
873 -A0 | 879 -A0 |
874 +C0 | 880 +C0 |
875 | 881 |
876 diff -r 471f378eab4c -r eb5a0daa2192 B0 | 882 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
895 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | 901 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
896 | (No patch available, changesets rebased) | 902 | (No patch available, changesets rebased) |
897 | | 903 | |
898 x 471f378eab4c (1) A0 | 904 x 471f378eab4c (1) A0 |
899 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | 905 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
900 --- a/471f378eab4c-changeset-description | 906 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
901 +++ b/eb5a0daa2192-changeset-description | 907 --- a/changeset-description |
908 +++ b/changeset-description | |
902 @@ -1,1 +1,1 @@ | 909 @@ -1,1 +1,1 @@ |
903 -A0 | 910 -A0 |
904 +C0 | 911 +C0 |
905 | 912 |
906 diff -r 471f378eab4c -r eb5a0daa2192 B0 | 913 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
919 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | 926 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
920 | (No patch available, changesets rebased) | 927 | (No patch available, changesets rebased) |
921 | | 928 | |
922 x 471f378eab4c (1) A0 | 929 x 471f378eab4c (1) A0 |
923 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | 930 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
924 --- a/471f378eab4c-changeset-description | 931 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
925 +++ b/eb5a0daa2192-changeset-description | 932 --- a/changeset-description |
933 +++ b/changeset-description | |
926 @@ -1,1 +1,1 @@ | 934 @@ -1,1 +1,1 @@ |
927 -A0 | 935 -A0 |
928 +C0 | 936 +C0 |
929 | 937 |
930 diff -r 471f378eab4c -r eb5a0daa2192 B0 | 938 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
1077 | 1085 |
1078 Check that debugobshistory on the divergent revision show both destinations | 1086 Check that debugobshistory on the divergent revision show both destinations |
1079 $ hg obslog --hidden 471f378eab4c --patch | 1087 $ hg obslog --hidden 471f378eab4c --patch |
1080 x 471f378eab4c (1) A0 | 1088 x 471f378eab4c (1) A0 |
1081 rewritten(description) as 65b757b745b9 by test (*) (glob) | 1089 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1082 --- a/471f378eab4c-changeset-description | 1090 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1083 +++ b/65b757b745b9-changeset-description | 1091 --- a/changeset-description |
1092 +++ b/changeset-description | |
1084 @@ -1,1 +1,1 @@ | 1093 @@ -1,1 +1,1 @@ |
1085 -A0 | 1094 -A0 |
1086 +A2 | 1095 +A2 |
1087 | 1096 |
1088 rewritten(description) as fdf9bde5129a by test (*) (glob) | 1097 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1089 --- a/471f378eab4c-changeset-description | 1098 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1090 +++ b/fdf9bde5129a-changeset-description | 1099 --- a/changeset-description |
1100 +++ b/changeset-description | |
1091 @@ -1,1 +1,1 @@ | 1101 @@ -1,1 +1,1 @@ |
1092 -A0 | 1102 -A0 |
1093 +A1 | 1103 +A1 |
1094 | 1104 |
1095 | 1105 |
1100 | | 1110 | |
1101 | * fdf9bde5129a (2) A1 | 1111 | * fdf9bde5129a (2) A1 |
1102 |/ | 1112 |/ |
1103 x 471f378eab4c (1) A0 | 1113 x 471f378eab4c (1) A0 |
1104 rewritten(description) as 65b757b745b9 by test (*) (glob) | 1114 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1105 --- a/471f378eab4c-changeset-description | 1115 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1106 +++ b/65b757b745b9-changeset-description | 1116 --- a/changeset-description |
1117 +++ b/changeset-description | |
1107 @@ -1,1 +1,1 @@ | 1118 @@ -1,1 +1,1 @@ |
1108 -A0 | 1119 -A0 |
1109 +A2 | 1120 +A2 |
1110 | 1121 |
1111 rewritten(description) as fdf9bde5129a by test (*) (glob) | 1122 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1112 --- a/471f378eab4c-changeset-description | 1123 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1113 +++ b/fdf9bde5129a-changeset-description | 1124 --- a/changeset-description |
1125 +++ b/changeset-description | |
1114 @@ -1,1 +1,1 @@ | 1126 @@ -1,1 +1,1 @@ |
1115 -A0 | 1127 -A0 |
1116 +A1 | 1128 +A1 |
1117 | 1129 |
1118 | 1130 |
1159 $ hg obslog fdf9bde5129a --patch | 1171 $ hg obslog fdf9bde5129a --patch |
1160 * fdf9bde5129a (2) A1 | 1172 * fdf9bde5129a (2) A1 |
1161 | | 1173 | |
1162 x 471f378eab4c (1) A0 | 1174 x 471f378eab4c (1) A0 |
1163 rewritten(description) as 65b757b745b9 by test (*) (glob) | 1175 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1164 --- a/471f378eab4c-changeset-description | 1176 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1165 +++ b/65b757b745b9-changeset-description | 1177 --- a/changeset-description |
1178 +++ b/changeset-description | |
1166 @@ -1,1 +1,1 @@ | 1179 @@ -1,1 +1,1 @@ |
1167 -A0 | 1180 -A0 |
1168 +A2 | 1181 +A2 |
1169 | 1182 |
1170 rewritten(description) as fdf9bde5129a by test (*) (glob) | 1183 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1171 --- a/471f378eab4c-changeset-description | 1184 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1172 +++ b/fdf9bde5129a-changeset-description | 1185 --- a/changeset-description |
1186 +++ b/changeset-description | |
1173 @@ -1,1 +1,1 @@ | 1187 @@ -1,1 +1,1 @@ |
1174 -A0 | 1188 -A0 |
1175 +A1 | 1189 +A1 |
1176 | 1190 |
1177 | 1191 |
1182 | | 1196 | |
1183 | * fdf9bde5129a (2) A1 | 1197 | * fdf9bde5129a (2) A1 |
1184 |/ | 1198 |/ |
1185 x 471f378eab4c (1) A0 | 1199 x 471f378eab4c (1) A0 |
1186 rewritten(description) as 65b757b745b9 by test (*) (glob) | 1200 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1187 --- a/471f378eab4c-changeset-description | 1201 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1188 +++ b/65b757b745b9-changeset-description | 1202 --- a/changeset-description |
1203 +++ b/changeset-description | |
1189 @@ -1,1 +1,1 @@ | 1204 @@ -1,1 +1,1 @@ |
1190 -A0 | 1205 -A0 |
1191 +A2 | 1206 +A2 |
1192 | 1207 |
1193 rewritten(description) as fdf9bde5129a by test (*) (glob) | 1208 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1194 --- a/471f378eab4c-changeset-description | 1209 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1195 +++ b/fdf9bde5129a-changeset-description | 1210 --- a/changeset-description |
1211 +++ b/changeset-description | |
1196 @@ -1,1 +1,1 @@ | 1212 @@ -1,1 +1,1 @@ |
1197 -A0 | 1213 -A0 |
1198 +A1 | 1214 +A1 |
1199 | 1215 |
1200 | 1216 |
1203 $ hg obslog 65b757b745b9 --patch | 1219 $ hg obslog 65b757b745b9 --patch |
1204 @ 65b757b745b9 (3) A2 | 1220 @ 65b757b745b9 (3) A2 |
1205 | | 1221 | |
1206 x 471f378eab4c (1) A0 | 1222 x 471f378eab4c (1) A0 |
1207 rewritten(description) as 65b757b745b9 by test (*) (glob) | 1223 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1208 --- a/471f378eab4c-changeset-description | 1224 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1209 +++ b/65b757b745b9-changeset-description | 1225 --- a/changeset-description |
1226 +++ b/changeset-description | |
1210 @@ -1,1 +1,1 @@ | 1227 @@ -1,1 +1,1 @@ |
1211 -A0 | 1228 -A0 |
1212 +A2 | 1229 +A2 |
1213 | 1230 |
1214 rewritten(description) as fdf9bde5129a by test (*) (glob) | 1231 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1215 --- a/471f378eab4c-changeset-description | 1232 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1216 +++ b/fdf9bde5129a-changeset-description | 1233 --- a/changeset-description |
1234 +++ b/changeset-description | |
1217 @@ -1,1 +1,1 @@ | 1235 @@ -1,1 +1,1 @@ |
1218 -A0 | 1236 -A0 |
1219 +A1 | 1237 +A1 |
1220 | 1238 |
1221 | 1239 |
1225 | | 1243 | |
1226 | * fdf9bde5129a (2) A1 | 1244 | * fdf9bde5129a (2) A1 |
1227 |/ | 1245 |/ |
1228 x 471f378eab4c (1) A0 | 1246 x 471f378eab4c (1) A0 |
1229 rewritten(description) as 65b757b745b9 by test (*) (glob) | 1247 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1230 --- a/471f378eab4c-changeset-description | 1248 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1231 +++ b/65b757b745b9-changeset-description | 1249 --- a/changeset-description |
1250 +++ b/changeset-description | |
1232 @@ -1,1 +1,1 @@ | 1251 @@ -1,1 +1,1 @@ |
1233 -A0 | 1252 -A0 |
1234 +A2 | 1253 +A2 |
1235 | 1254 |
1236 rewritten(description) as fdf9bde5129a by test (*) (glob) | 1255 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1237 --- a/471f378eab4c-changeset-description | 1256 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1238 +++ b/fdf9bde5129a-changeset-description | 1257 --- a/changeset-description |
1258 +++ b/changeset-description | |
1239 @@ -1,1 +1,1 @@ | 1259 @@ -1,1 +1,1 @@ |
1240 -A0 | 1260 -A0 |
1241 +A1 | 1261 +A1 |
1242 | 1262 |
1243 | 1263 |
1248 | | 1268 | |
1249 | * fdf9bde5129a (2) A1 | 1269 | * fdf9bde5129a (2) A1 |
1250 |/ | 1270 |/ |
1251 x 471f378eab4c (1) A0 | 1271 x 471f378eab4c (1) A0 |
1252 rewritten(description) as 65b757b745b9 by test (*) (glob) | 1272 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1253 --- a/471f378eab4c-changeset-description | 1273 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1254 +++ b/65b757b745b9-changeset-description | 1274 --- a/changeset-description |
1275 +++ b/changeset-description | |
1255 @@ -1,1 +1,1 @@ | 1276 @@ -1,1 +1,1 @@ |
1256 -A0 | 1277 -A0 |
1257 +A2 | 1278 +A2 |
1258 | 1279 |
1259 rewritten(description) as fdf9bde5129a by test (*) (glob) | 1280 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1260 --- a/471f378eab4c-changeset-description | 1281 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1261 +++ b/fdf9bde5129a-changeset-description | 1282 --- a/changeset-description |
1283 +++ b/changeset-description | |
1262 @@ -1,1 +1,1 @@ | 1284 @@ -1,1 +1,1 @@ |
1263 -A0 | 1285 -A0 |
1264 +A1 | 1286 +A1 |
1265 | 1287 |
1266 | 1288 |
1402 $ hg obslog eb5a0daa2192 --patch | 1424 $ hg obslog eb5a0daa2192 --patch |
1403 @ eb5a0daa2192 (4) C0 | 1425 @ eb5a0daa2192 (4) C0 |
1404 |\ | 1426 |\ |
1405 x | 471f378eab4c (1) A0 | 1427 x | 471f378eab4c (1) A0 |
1406 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | 1428 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1407 | --- a/471f378eab4c-changeset-description | 1429 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
1408 | +++ b/eb5a0daa2192-changeset-description | 1430 | --- a/changeset-description |
1431 | +++ b/changeset-description | |
1409 | @@ -1,1 +1,1 @@ | 1432 | @@ -1,1 +1,1 @@ |
1410 | -A0 | 1433 | -A0 |
1411 | +C0 | 1434 | +C0 |
1412 | | 1435 | |
1413 | diff -r 471f378eab4c -r eb5a0daa2192 B0 | 1436 | diff -r 471f378eab4c -r eb5a0daa2192 B0 |
1421 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | 1444 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1422 | (No patch available, changesets rebased) | 1445 | (No patch available, changesets rebased) |
1423 | | 1446 | |
1424 x 0dec01379d3b (2) B0 | 1447 x 0dec01379d3b (2) B0 |
1425 rewritten(description) as b7ea6d14e664 by test (*) (glob) | 1448 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1426 --- a/0dec01379d3b-changeset-description | 1449 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
1427 +++ b/b7ea6d14e664-changeset-description | 1450 --- a/changeset-description |
1451 +++ b/changeset-description | |
1428 @@ -1,1 +1,1 @@ | 1452 @@ -1,1 +1,1 @@ |
1429 -B0 | 1453 -B0 |
1430 +B1 | 1454 +B1 |
1431 | 1455 |
1432 | 1456 |
1434 $ hg obslog 1 --hidden --all --patch | 1458 $ hg obslog 1 --hidden --all --patch |
1435 @ eb5a0daa2192 (4) C0 | 1459 @ eb5a0daa2192 (4) C0 |
1436 |\ | 1460 |\ |
1437 x | 471f378eab4c (1) A0 | 1461 x | 471f378eab4c (1) A0 |
1438 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) | 1462 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1439 | --- a/471f378eab4c-changeset-description | 1463 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
1440 | +++ b/eb5a0daa2192-changeset-description | 1464 | --- a/changeset-description |
1465 | +++ b/changeset-description | |
1441 | @@ -1,1 +1,1 @@ | 1466 | @@ -1,1 +1,1 @@ |
1442 | -A0 | 1467 | -A0 |
1443 | +C0 | 1468 | +C0 |
1444 | | 1469 | |
1445 | diff -r 471f378eab4c -r eb5a0daa2192 B0 | 1470 | diff -r 471f378eab4c -r eb5a0daa2192 B0 |
1453 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) | 1478 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1454 | (No patch available, changesets rebased) | 1479 | (No patch available, changesets rebased) |
1455 | | 1480 | |
1456 x 0dec01379d3b (2) B0 | 1481 x 0dec01379d3b (2) B0 |
1457 rewritten(description) as b7ea6d14e664 by test (*) (glob) | 1482 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1458 --- a/0dec01379d3b-changeset-description | 1483 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
1459 +++ b/b7ea6d14e664-changeset-description | 1484 --- a/changeset-description |
1485 +++ b/changeset-description | |
1460 @@ -1,1 +1,1 @@ | 1486 @@ -1,1 +1,1 @@ |
1461 -B0 | 1487 -B0 |
1462 +B1 | 1488 +B1 |
1463 | 1489 |
1464 | 1490 |
1629 $ hg obslog 7a230b46bf61 --patch | 1655 $ hg obslog 7a230b46bf61 --patch |
1630 @ 7a230b46bf61 (3) A2 | 1656 @ 7a230b46bf61 (3) A2 |
1631 | | 1657 | |
1632 x fdf9bde5129a (2) A1 | 1658 x fdf9bde5129a (2) A1 |
1633 | rewritten(description) as 7a230b46bf61 by test (*) (glob) | 1659 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
1634 | --- a/fdf9bde5129a-changeset-description | 1660 | diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description |
1635 | +++ b/7a230b46bf61-changeset-description | 1661 | --- a/changeset-description |
1662 | +++ b/changeset-description | |
1636 | @@ -1,1 +1,1 @@ | 1663 | @@ -1,1 +1,1 @@ |
1637 | -A1 | 1664 | -A1 |
1638 | +A2 | 1665 | +A2 |
1639 | | 1666 | |
1640 | | 1667 | |
1641 x 471f378eab4c (1) A0 | 1668 x 471f378eab4c (1) A0 |
1642 rewritten(description) as fdf9bde5129a by test (*) (glob) | 1669 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1643 --- a/471f378eab4c-changeset-description | 1670 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1644 +++ b/fdf9bde5129a-changeset-description | 1671 --- a/changeset-description |
1672 +++ b/changeset-description | |
1645 @@ -1,1 +1,1 @@ | 1673 @@ -1,1 +1,1 @@ |
1646 -A0 | 1674 -A0 |
1647 +A1 | 1675 +A1 |
1648 | 1676 |
1649 | 1677 |