Show More
@@ -42,7 +42,7 b' Test setup' | |||||
42 | $ mkcommit ROOT |
|
42 | $ mkcommit ROOT | |
43 | $ mkcommit A0 |
|
43 | $ mkcommit A0 | |
44 | $ echo 42 >> A0 |
|
44 | $ echo 42 >> A0 | |
45 |
$ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" |
|
45 | $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" | |
46 | $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 |
|
46 | $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 | |
47 |
|
47 | |||
48 | $ hg log --hidden -G |
|
48 | $ hg log --hidden -G | |
@@ -91,7 +91,7 b' Predecessors template should show curren' | |||||
91 | o d004c8f274b9 |
|
91 | o d004c8f274b9 | |
92 | | |
|
92 | | | |
93 | | @ 471f378eab4c |
|
93 | | @ 471f378eab4c | |
94 |
|/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test |
|
94 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); | |
95 | o ea207398892e |
|
95 | o ea207398892e | |
96 |
|
96 | |||
97 | $ hg up 'desc(A1)' --hidden |
|
97 | $ hg up 'desc(A1)' --hidden | |
@@ -145,7 +145,7 b' with --hidden' | |||||
145 | | @ a468dc9b3633 |
|
145 | | @ a468dc9b3633 | |
146 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
146 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | |
147 | | x 471f378eab4c |
|
147 | | x 471f378eab4c | |
148 |
|/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test |
|
148 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); | |
149 | o ea207398892e |
|
149 | o ea207398892e | |
150 |
|
150 | |||
151 |
|
151 | |||
@@ -190,7 +190,7 b' visible.' | |||||
190 | | x a468dc9b3633 |
|
190 | | x a468dc9b3633 | |
191 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
|
191 | |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | |
192 | | x 471f378eab4c |
|
192 | | x 471f378eab4c | |
193 |
|/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test |
|
193 | |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); | |
194 | o ea207398892e |
|
194 | o ea207398892e | |
195 |
|
195 | |||
196 | $ hg fatelogjson --hidden |
|
196 | $ hg fatelogjson --hidden | |
@@ -199,7 +199,7 b' visible.' | |||||
199 | | x a468dc9b3633 |
|
199 | | x a468dc9b3633 | |
200 | |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] |
|
200 | |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] | |
201 | | x 471f378eab4c |
|
201 | | x 471f378eab4c | |
202 |
|/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test |
|
202 | |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] | |
203 | o ea207398892e |
|
203 | o ea207398892e | |
204 |
|
204 | |||
205 | Test templates with splitted commit |
|
205 | Test templates with splitted commit |
General Comments 0
You need to be logged in to leave comments.
Login now