equal
deleted
inserted
replaced
243 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
243 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000) |
244 | |
244 | |
245 o ea207398892e |
245 o ea207398892e |
246 |
246 |
247 |
247 |
248 Test templates with splitted commit |
248 Test templates with split commit |
249 =================================== |
249 ================================ |
250 |
250 |
251 $ hg init $TESTTMP/templates-local-split |
251 $ hg init $TESTTMP/templates-local-split |
252 $ cd $TESTTMP/templates-local-split |
252 $ cd $TESTTMP/templates-local-split |
253 $ mkcommit ROOT |
253 $ mkcommit ROOT |
254 $ echo 42 >> a |
254 $ echo 42 >> a |
1311 o changeset: 0:ea207398892e |
1311 o changeset: 0:ea207398892e |
1312 user: test |
1312 user: test |
1313 date: Thu Jan 01 00:00:00 1970 +0000 |
1313 date: Thu Jan 01 00:00:00 1970 +0000 |
1314 summary: ROOT |
1314 summary: ROOT |
1315 |
1315 |
1316 Diverge one of the splitted commit |
1316 Diverge one of the split commit |
1317 |
1317 |
1318 $ hg up 6 |
1318 $ hg up 6 |
1319 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1319 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1320 $ hg commit --amend -m "Add only B" |
1320 $ hg commit --amend -m "Add only B" |
1321 1 new orphan changesets |
1321 1 new orphan changesets |