equal
deleted
inserted
replaced
4 Global setup |
4 Global setup |
5 ============ |
5 ============ |
6 |
6 |
7 $ . $TESTDIR/testlib/obshistory_setup.sh |
7 $ . $TESTDIR/testlib/obshistory_setup.sh |
8 |
8 |
9 Test output with splitted commit |
9 Test output with split commit |
10 ================================ |
10 ============================= |
11 |
11 |
12 Test setup |
12 Test setup |
13 ---------- |
13 ---------- |
14 |
14 |
15 $ hg init $TESTTMP/local-split |
15 $ hg init $TESTTMP/local-split |
96 summary: ROOT |
96 summary: ROOT |
97 |
97 |
98 Check output on the client side |
98 Check output on the client side |
99 ------------------------------- |
99 ------------------------------- |
100 |
100 |
101 Check that debugobshistory on splitted commit show both targets |
101 Check that debugobshistory on split commit show both targets |
102 $ hg obslog 471597cad322 --hidden --patch |
102 $ hg obslog 471597cad322 --hidden --patch |
103 x 471597cad322 (1) A0 |
103 x 471597cad322 (1) A0 |
104 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
104 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
105 note: testing split |
105 note: testing split |
106 (No patch available, too many successors (2)) |
106 (No patch available, too many successors (2)) |
132 "rev": 1, |
132 "rev": 1, |
133 "shortdescription": "A0" |
133 "shortdescription": "A0" |
134 } |
134 } |
135 ] |
135 ] |
136 Check that debugobshistory on the first successor after split show |
136 Check that debugobshistory on the first successor after split show |
137 the revision plus the splitted one |
137 the revision plus the split one |
138 $ hg obslog 337fec4d2edc --patch |
138 $ hg obslog 337fec4d2edc --patch |
139 o 337fec4d2edc (2) A0 |
139 o 337fec4d2edc (2) A0 |
140 | |
140 | |
141 x 471597cad322 (1) A0 |
141 x 471597cad322 (1) A0 |
142 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
142 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
153 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
153 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
154 note: testing split |
154 note: testing split |
155 (No patch available, too many successors (2)) |
155 (No patch available, too many successors (2)) |
156 |
156 |
157 Check that debugobshistory on the second successor after split show |
157 Check that debugobshistory on the second successor after split show |
158 the revision plus the splitted one |
158 the revision plus the split one |
159 $ hg obslog f257fde29c7a --patch |
159 $ hg obslog f257fde29c7a --patch |
160 @ f257fde29c7a (3) A0 |
160 @ f257fde29c7a (3) A0 |
161 | |
161 | |
162 x 471597cad322 (1) A0 |
162 x 471597cad322 (1) A0 |
163 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
163 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
173 x 471597cad322 (1) A0 |
173 x 471597cad322 (1) A0 |
174 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
174 rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
175 note: testing split |
175 note: testing split |
176 (No patch available, too many successors (2)) |
176 (No patch available, too many successors (2)) |
177 |
177 |
178 Obslog with all option all should also works on the splitted commit |
178 Obslog with all option all should also works on the split commit |
179 $ hg obslog -a 471597cad322 --hidden --patch |
179 $ hg obslog -a 471597cad322 --hidden --patch |
180 o 337fec4d2edc (2) A0 |
180 o 337fec4d2edc (2) A0 |
181 | |
181 | |
182 | @ f257fde29c7a (3) A0 |
182 | @ f257fde29c7a (3) A0 |
183 |/ |
183 |/ |