58 $ hg obslog --patch 4ae3a4151de9 |
58 $ hg obslog --patch 4ae3a4151de9 |
59 @ 4ae3a4151de9 (3) A1 |
59 @ 4ae3a4151de9 (3) A1 |
60 | |
60 | |
61 x 471f378eab4c (1) A0 |
61 x 471f378eab4c (1) A0 |
62 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
62 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
63 --- a/471f378eab4c-changeset-description |
63 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
64 +++ b/4ae3a4151de9-changeset-description |
64 --- a/changeset-description |
|
65 +++ b/changeset-description |
65 @@ -1,1 +1,3 @@ |
66 @@ -1,1 +1,3 @@ |
66 -A0 |
67 -A0 |
67 +A1 |
68 +A1 |
68 + |
69 + |
69 +Better commit message |
70 +Better commit message |
74 @@ -1,1 +1,2 @@ |
75 @@ -1,1 +1,2 @@ |
75 A0 |
76 A0 |
76 +42 |
77 +42 |
77 |
78 |
78 |
79 |
|
80 $ hg obslog --patch --color debug |
|
81 @ [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1] |
|
82 | |
|
83 x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
|
84 [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(*)] (glob) |
|
85 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description] |
|
86 [diff.file_a|--- a/changeset-description] |
|
87 [diff.file_b|+++ b/changeset-description] |
|
88 [diff.hunk|@@ -1,1 +1,3 @@] |
|
89 [diff.deleted|-A0] |
|
90 [diff.inserted|+A1] |
|
91 [diff.inserted|+] |
|
92 [diff.inserted|+Better commit message] |
|
93 |
|
94 [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0] |
|
95 [diff.file_a|--- a/A0 Thu Jan 01 00:00:00 1970 +0000] |
|
96 [diff.file_b|+++ b/A0 Thu Jan 01 00:00:00 1970 +0000] |
|
97 [diff.hunk|@@ -1,1 +1,2 @@] |
|
98 A0 |
|
99 [diff.inserted|+42] |
|
100 |
|
101 |
79 |
102 |
80 $ hg obslog --no-graph --patch 4ae3a4151de9 |
103 $ hg obslog --no-graph --patch 4ae3a4151de9 |
81 4ae3a4151de9 (3) A1 |
104 4ae3a4151de9 (3) A1 |
82 471f378eab4c (1) A0 |
105 471f378eab4c (1) A0 |
83 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
106 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
84 --- a/471f378eab4c-changeset-description |
107 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
85 +++ b/4ae3a4151de9-changeset-description |
108 --- a/changeset-description |
|
109 +++ b/changeset-description |
86 @@ -1,1 +1,3 @@ |
110 @@ -1,1 +1,3 @@ |
87 -A0 |
111 -A0 |
88 +A1 |
112 +A1 |
89 + |
113 + |
90 +Better commit message |
114 +Better commit message |
134 } |
158 } |
135 ] |
159 ] |
136 $ hg obslog --hidden --patch 471f378eab4c |
160 $ hg obslog --hidden --patch 471f378eab4c |
137 x 471f378eab4c (1) A0 |
161 x 471f378eab4c (1) A0 |
138 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
162 rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
139 --- a/471f378eab4c-changeset-description |
163 diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
140 +++ b/4ae3a4151de9-changeset-description |
164 --- a/changeset-description |
|
165 +++ b/changeset-description |
141 @@ -1,1 +1,3 @@ |
166 @@ -1,1 +1,3 @@ |
142 -A0 |
167 -A0 |
143 +A1 |
168 +A1 |
144 + |
169 + |
145 +Better commit message |
170 +Better commit message |
817 Check that debugobshistory on the first folded revision show only |
842 Check that debugobshistory on the first folded revision show only |
818 the revision with the target |
843 the revision with the target |
819 $ hg obslog --hidden 471f378eab4c --patch |
844 $ hg obslog --hidden 471f378eab4c --patch |
820 x 471f378eab4c (1) A0 |
845 x 471f378eab4c (1) A0 |
821 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
846 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
822 --- a/471f378eab4c-changeset-description |
847 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
823 +++ b/eb5a0daa2192-changeset-description |
848 --- a/changeset-description |
|
849 +++ b/changeset-description |
824 @@ -1,1 +1,1 @@ |
850 @@ -1,1 +1,1 @@ |
825 -A0 |
851 -A0 |
826 +C0 |
852 +C0 |
827 |
853 |
828 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
854 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
840 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
866 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
841 | (No patch available, changesets rebased) |
867 | (No patch available, changesets rebased) |
842 | |
868 | |
843 x 471f378eab4c (1) A0 |
869 x 471f378eab4c (1) A0 |
844 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
870 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
845 --- a/471f378eab4c-changeset-description |
871 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
846 +++ b/eb5a0daa2192-changeset-description |
872 --- a/changeset-description |
|
873 +++ b/changeset-description |
847 @@ -1,1 +1,1 @@ |
874 @@ -1,1 +1,1 @@ |
848 -A0 |
875 -A0 |
849 +C0 |
876 +C0 |
850 |
877 |
851 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
878 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
870 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
897 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
871 | (No patch available, changesets rebased) |
898 | (No patch available, changesets rebased) |
872 | |
899 | |
873 x 471f378eab4c (1) A0 |
900 x 471f378eab4c (1) A0 |
874 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
901 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
875 --- a/471f378eab4c-changeset-description |
902 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
876 +++ b/eb5a0daa2192-changeset-description |
903 --- a/changeset-description |
|
904 +++ b/changeset-description |
877 @@ -1,1 +1,1 @@ |
905 @@ -1,1 +1,1 @@ |
878 -A0 |
906 -A0 |
879 +C0 |
907 +C0 |
880 |
908 |
881 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
909 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
894 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
922 / rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
895 | (No patch available, changesets rebased) |
923 | (No patch available, changesets rebased) |
896 | |
924 | |
897 x 471f378eab4c (1) A0 |
925 x 471f378eab4c (1) A0 |
898 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
926 rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
899 --- a/471f378eab4c-changeset-description |
927 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
900 +++ b/eb5a0daa2192-changeset-description |
928 --- a/changeset-description |
|
929 +++ b/changeset-description |
901 @@ -1,1 +1,1 @@ |
930 @@ -1,1 +1,1 @@ |
902 -A0 |
931 -A0 |
903 +C0 |
932 +C0 |
904 |
933 |
905 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
934 diff -r 471f378eab4c -r eb5a0daa2192 B0 |
970 $ hg update --hidden 'desc(A0)' |
999 $ hg update --hidden 'desc(A0)' |
971 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
972 working directory parent is obsolete! (471f378eab4c) |
1001 working directory parent is obsolete! (471f378eab4c) |
973 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1002 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
974 $ hg update 0dec01379d3b |
1003 $ hg update 0dec01379d3b |
975 working directory parent is obsolete! (471f378eab4c) |
|
976 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
977 abort: hidden revision '0dec01379d3b'! |
1004 abort: hidden revision '0dec01379d3b'! |
978 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
1005 (use --hidden to access hidden revisions; successor: eb5a0daa2192) |
979 [255] |
1006 [255] |
980 $ hg update --hidden 'desc(B0)' |
1007 $ hg update --hidden 'desc(B0)' |
981 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1008 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1048 |
1075 |
1049 Check that debugobshistory on the divergent revision show both destinations |
1076 Check that debugobshistory on the divergent revision show both destinations |
1050 $ hg obslog --hidden 471f378eab4c --patch |
1077 $ hg obslog --hidden 471f378eab4c --patch |
1051 x 471f378eab4c (1) A0 |
1078 x 471f378eab4c (1) A0 |
1052 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1079 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1053 --- a/471f378eab4c-changeset-description |
1080 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1054 +++ b/65b757b745b9-changeset-description |
1081 --- a/changeset-description |
|
1082 +++ b/changeset-description |
1055 @@ -1,1 +1,1 @@ |
1083 @@ -1,1 +1,1 @@ |
1056 -A0 |
1084 -A0 |
1057 +A2 |
1085 +A2 |
1058 |
1086 |
1059 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1087 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1060 --- a/471f378eab4c-changeset-description |
1088 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1061 +++ b/fdf9bde5129a-changeset-description |
1089 --- a/changeset-description |
|
1090 +++ b/changeset-description |
1062 @@ -1,1 +1,1 @@ |
1091 @@ -1,1 +1,1 @@ |
1063 -A0 |
1092 -A0 |
1064 +A1 |
1093 +A1 |
1065 |
1094 |
1066 |
1095 |
1071 | |
1100 | |
1072 | o fdf9bde5129a (2) A1 |
1101 | o fdf9bde5129a (2) A1 |
1073 |/ |
1102 |/ |
1074 x 471f378eab4c (1) A0 |
1103 x 471f378eab4c (1) A0 |
1075 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1104 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1076 --- a/471f378eab4c-changeset-description |
1105 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1077 +++ b/65b757b745b9-changeset-description |
1106 --- a/changeset-description |
|
1107 +++ b/changeset-description |
1078 @@ -1,1 +1,1 @@ |
1108 @@ -1,1 +1,1 @@ |
1079 -A0 |
1109 -A0 |
1080 +A2 |
1110 +A2 |
1081 |
1111 |
1082 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1112 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1083 --- a/471f378eab4c-changeset-description |
1113 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1084 +++ b/fdf9bde5129a-changeset-description |
1114 --- a/changeset-description |
|
1115 +++ b/changeset-description |
1085 @@ -1,1 +1,1 @@ |
1116 @@ -1,1 +1,1 @@ |
1086 -A0 |
1117 -A0 |
1087 +A1 |
1118 +A1 |
1088 |
1119 |
1089 |
1120 |
1130 $ hg obslog fdf9bde5129a --patch |
1161 $ hg obslog fdf9bde5129a --patch |
1131 o fdf9bde5129a (2) A1 |
1162 o fdf9bde5129a (2) A1 |
1132 | |
1163 | |
1133 x 471f378eab4c (1) A0 |
1164 x 471f378eab4c (1) A0 |
1134 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1165 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1135 --- a/471f378eab4c-changeset-description |
1166 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1136 +++ b/65b757b745b9-changeset-description |
1167 --- a/changeset-description |
|
1168 +++ b/changeset-description |
1137 @@ -1,1 +1,1 @@ |
1169 @@ -1,1 +1,1 @@ |
1138 -A0 |
1170 -A0 |
1139 +A2 |
1171 +A2 |
1140 |
1172 |
1141 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1173 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1142 --- a/471f378eab4c-changeset-description |
1174 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1143 +++ b/fdf9bde5129a-changeset-description |
1175 --- a/changeset-description |
|
1176 +++ b/changeset-description |
1144 @@ -1,1 +1,1 @@ |
1177 @@ -1,1 +1,1 @@ |
1145 -A0 |
1178 -A0 |
1146 +A1 |
1179 +A1 |
1147 |
1180 |
1148 |
1181 |
1153 | |
1186 | |
1154 | o fdf9bde5129a (2) A1 |
1187 | o fdf9bde5129a (2) A1 |
1155 |/ |
1188 |/ |
1156 x 471f378eab4c (1) A0 |
1189 x 471f378eab4c (1) A0 |
1157 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1190 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1158 --- a/471f378eab4c-changeset-description |
1191 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1159 +++ b/65b757b745b9-changeset-description |
1192 --- a/changeset-description |
|
1193 +++ b/changeset-description |
1160 @@ -1,1 +1,1 @@ |
1194 @@ -1,1 +1,1 @@ |
1161 -A0 |
1195 -A0 |
1162 +A2 |
1196 +A2 |
1163 |
1197 |
1164 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1198 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1165 --- a/471f378eab4c-changeset-description |
1199 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1166 +++ b/fdf9bde5129a-changeset-description |
1200 --- a/changeset-description |
|
1201 +++ b/changeset-description |
1167 @@ -1,1 +1,1 @@ |
1202 @@ -1,1 +1,1 @@ |
1168 -A0 |
1203 -A0 |
1169 +A1 |
1204 +A1 |
1170 |
1205 |
1171 |
1206 |
1174 $ hg obslog 65b757b745b9 --patch |
1209 $ hg obslog 65b757b745b9 --patch |
1175 @ 65b757b745b9 (3) A2 |
1210 @ 65b757b745b9 (3) A2 |
1176 | |
1211 | |
1177 x 471f378eab4c (1) A0 |
1212 x 471f378eab4c (1) A0 |
1178 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1213 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1179 --- a/471f378eab4c-changeset-description |
1214 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1180 +++ b/65b757b745b9-changeset-description |
1215 --- a/changeset-description |
|
1216 +++ b/changeset-description |
1181 @@ -1,1 +1,1 @@ |
1217 @@ -1,1 +1,1 @@ |
1182 -A0 |
1218 -A0 |
1183 +A2 |
1219 +A2 |
1184 |
1220 |
1185 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1221 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1186 --- a/471f378eab4c-changeset-description |
1222 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1187 +++ b/fdf9bde5129a-changeset-description |
1223 --- a/changeset-description |
|
1224 +++ b/changeset-description |
1188 @@ -1,1 +1,1 @@ |
1225 @@ -1,1 +1,1 @@ |
1189 -A0 |
1226 -A0 |
1190 +A1 |
1227 +A1 |
1191 |
1228 |
1192 |
1229 |
1196 | |
1233 | |
1197 | o fdf9bde5129a (2) A1 |
1234 | o fdf9bde5129a (2) A1 |
1198 |/ |
1235 |/ |
1199 x 471f378eab4c (1) A0 |
1236 x 471f378eab4c (1) A0 |
1200 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1237 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1201 --- a/471f378eab4c-changeset-description |
1238 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1202 +++ b/65b757b745b9-changeset-description |
1239 --- a/changeset-description |
|
1240 +++ b/changeset-description |
1203 @@ -1,1 +1,1 @@ |
1241 @@ -1,1 +1,1 @@ |
1204 -A0 |
1242 -A0 |
1205 +A2 |
1243 +A2 |
1206 |
1244 |
1207 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1245 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1208 --- a/471f378eab4c-changeset-description |
1246 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1209 +++ b/fdf9bde5129a-changeset-description |
1247 --- a/changeset-description |
|
1248 +++ b/changeset-description |
1210 @@ -1,1 +1,1 @@ |
1249 @@ -1,1 +1,1 @@ |
1211 -A0 |
1250 -A0 |
1212 +A1 |
1251 +A1 |
1213 |
1252 |
1214 |
1253 |
1219 | |
1258 | |
1220 | o fdf9bde5129a (2) A1 |
1259 | o fdf9bde5129a (2) A1 |
1221 |/ |
1260 |/ |
1222 x 471f378eab4c (1) A0 |
1261 x 471f378eab4c (1) A0 |
1223 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1262 rewritten(description) as 65b757b745b9 by test (*) (glob) |
1224 --- a/471f378eab4c-changeset-description |
1263 diff -r 471f378eab4c -r 65b757b745b9 changeset-description |
1225 +++ b/65b757b745b9-changeset-description |
1264 --- a/changeset-description |
|
1265 +++ b/changeset-description |
1226 @@ -1,1 +1,1 @@ |
1266 @@ -1,1 +1,1 @@ |
1227 -A0 |
1267 -A0 |
1228 +A2 |
1268 +A2 |
1229 |
1269 |
1230 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1270 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1231 --- a/471f378eab4c-changeset-description |
1271 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1232 +++ b/fdf9bde5129a-changeset-description |
1272 --- a/changeset-description |
|
1273 +++ b/changeset-description |
1233 @@ -1,1 +1,1 @@ |
1274 @@ -1,1 +1,1 @@ |
1234 -A0 |
1275 -A0 |
1235 +A1 |
1276 +A1 |
1236 |
1277 |
1237 |
1278 |
1368 $ hg obslog eb5a0daa2192 --patch |
1409 $ hg obslog eb5a0daa2192 --patch |
1369 @ eb5a0daa2192 (4) C0 |
1410 @ eb5a0daa2192 (4) C0 |
1370 |\ |
1411 |\ |
1371 x | 471f378eab4c (1) A0 |
1412 x | 471f378eab4c (1) A0 |
1372 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1413 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1373 | --- a/471f378eab4c-changeset-description |
1414 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
1374 | +++ b/eb5a0daa2192-changeset-description |
1415 | --- a/changeset-description |
|
1416 | +++ b/changeset-description |
1375 | @@ -1,1 +1,1 @@ |
1417 | @@ -1,1 +1,1 @@ |
1376 | -A0 |
1418 | -A0 |
1377 | +C0 |
1419 | +C0 |
1378 | |
1420 | |
1379 | diff -r 471f378eab4c -r eb5a0daa2192 B0 |
1421 | diff -r 471f378eab4c -r eb5a0daa2192 B0 |
1387 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1429 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1388 | (No patch available, changesets rebased) |
1430 | (No patch available, changesets rebased) |
1389 | |
1431 | |
1390 x 0dec01379d3b (2) B0 |
1432 x 0dec01379d3b (2) B0 |
1391 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1433 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1392 --- a/0dec01379d3b-changeset-description |
1434 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
1393 +++ b/b7ea6d14e664-changeset-description |
1435 --- a/changeset-description |
|
1436 +++ b/changeset-description |
1394 @@ -1,1 +1,1 @@ |
1437 @@ -1,1 +1,1 @@ |
1395 -B0 |
1438 -B0 |
1396 +B1 |
1439 +B1 |
1397 |
1440 |
1398 |
1441 |
1400 $ hg obslog 1 --hidden --all --patch |
1443 $ hg obslog 1 --hidden --all --patch |
1401 @ eb5a0daa2192 (4) C0 |
1444 @ eb5a0daa2192 (4) C0 |
1402 |\ |
1445 |\ |
1403 x | 471f378eab4c (1) A0 |
1446 x | 471f378eab4c (1) A0 |
1404 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1447 / rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
1405 | --- a/471f378eab4c-changeset-description |
1448 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
1406 | +++ b/eb5a0daa2192-changeset-description |
1449 | --- a/changeset-description |
|
1450 | +++ b/changeset-description |
1407 | @@ -1,1 +1,1 @@ |
1451 | @@ -1,1 +1,1 @@ |
1408 | -A0 |
1452 | -A0 |
1409 | +C0 |
1453 | +C0 |
1410 | |
1454 | |
1411 | diff -r 471f378eab4c -r eb5a0daa2192 B0 |
1455 | diff -r 471f378eab4c -r eb5a0daa2192 B0 |
1419 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1463 | rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
1420 | (No patch available, changesets rebased) |
1464 | (No patch available, changesets rebased) |
1421 | |
1465 | |
1422 x 0dec01379d3b (2) B0 |
1466 x 0dec01379d3b (2) B0 |
1423 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1467 rewritten(description) as b7ea6d14e664 by test (*) (glob) |
1424 --- a/0dec01379d3b-changeset-description |
1468 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
1425 +++ b/b7ea6d14e664-changeset-description |
1469 --- a/changeset-description |
|
1470 +++ b/changeset-description |
1426 @@ -1,1 +1,1 @@ |
1471 @@ -1,1 +1,1 @@ |
1427 -B0 |
1472 -B0 |
1428 +B1 |
1473 +B1 |
1429 |
1474 |
1430 |
1475 |
1515 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1560 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1516 working directory parent is obsolete! (0dec01379d3b) |
1561 working directory parent is obsolete! (0dec01379d3b) |
1517 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1562 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
1518 $ hg update 0dec01379d3b |
1563 $ hg update 0dec01379d3b |
1519 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1564 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1520 working directory parent is obsolete! (0dec01379d3b) |
|
1521 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
1522 $ hg update --hidden 'desc(B0)' |
1565 $ hg update --hidden 'desc(B0)' |
1523 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1566 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1524 working directory parent is obsolete! (0dec01379d3b) |
|
1525 (use 'hg evolve' to update to its successor: eb5a0daa2192) |
|
1526 |
1567 |
1527 Test output with pushed and pulled obs markers |
1568 Test output with pushed and pulled obs markers |
1528 ============================================== |
1569 ============================================== |
1529 |
1570 |
1530 Test setup |
1571 Test setup |
1595 $ hg obslog 7a230b46bf61 --patch |
1636 $ hg obslog 7a230b46bf61 --patch |
1596 @ 7a230b46bf61 (3) A2 |
1637 @ 7a230b46bf61 (3) A2 |
1597 | |
1638 | |
1598 x fdf9bde5129a (2) A1 |
1639 x fdf9bde5129a (2) A1 |
1599 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
1640 | rewritten(description) as 7a230b46bf61 by test (*) (glob) |
1600 | --- a/fdf9bde5129a-changeset-description |
1641 | diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description |
1601 | +++ b/7a230b46bf61-changeset-description |
1642 | --- a/changeset-description |
|
1643 | +++ b/changeset-description |
1602 | @@ -1,1 +1,1 @@ |
1644 | @@ -1,1 +1,1 @@ |
1603 | -A1 |
1645 | -A1 |
1604 | +A2 |
1646 | +A2 |
1605 | |
1647 | |
1606 | |
1648 | |
1607 x 471f378eab4c (1) A0 |
1649 x 471f378eab4c (1) A0 |
1608 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1650 rewritten(description) as fdf9bde5129a by test (*) (glob) |
1609 --- a/471f378eab4c-changeset-description |
1651 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
1610 +++ b/fdf9bde5129a-changeset-description |
1652 --- a/changeset-description |
|
1653 +++ b/changeset-description |
1611 @@ -1,1 +1,1 @@ |
1654 @@ -1,1 +1,1 @@ |
1612 -A0 |
1655 -A0 |
1613 +A1 |
1656 +A1 |
1614 |
1657 |
1615 |
1658 |