Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | experiments/fossil-child: update to move bad commit out of trunk |
|---|---|
| Timelines: | family | ancestors | descendants | both | old-trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
610f6f399a79790cc28889ab872a804d |
| User & Date: | patmaddox 2023-05-12 10:28:54 |
Context
|
2023-05-12
| ||
| 17:55 | notes: [fossil] what I like: amending commit messages check-in: c0c8e1094e user: patmaddox tags: old-trunk | |
| 10:28 | experiments/fossil-child: update to move bad commit out of trunk check-in: 610f6f399a user: patmaddox tags: old-trunk | |
| 03:26 | experiments/fossil-child: set up parent/child project relationship check-in: 794ef13b76 user: patmaddox tags: old-trunk | |
Changes
Changes to experiments/fossil-child/fossil-child.sh.
| ︙ | ︙ | |||
30 31 32 33 34 35 36 |
UPDATE config SET name='parent-project-name' WHERE name='project-name';
INSERT INTO config(name,value)
VALUES('project-code',lower(hex(randomblob(20))));
INSERT INTO config(name,value)
VALUES('project-name','fossil child repo');
EOF
| < | > > > > > > > > > > > > > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 |
UPDATE config SET name='parent-project-name' WHERE name='project-name';
INSERT INTO config(name,value)
VALUES('project-code',lower(hex(randomblob(20))));
INSERT INTO config(name,value)
VALUES('project-name','fossil child repo');
EOF
echo '== adding child bar'
echo 'child-bar 1' > child-bar
fossil add child-bar
fossil commit -m 'BAD add child-bar'
echo 'child-bar 2' >> child-bar
fossil commit -m 'update child-bar'
echo '== updating parent-foo'
cd ../parent
echo 'parent-foo 2' >> parent-foo
fossil commit -m 'update parent-foo'
echo '== pulling parent into child'
cd ../child
fossil pull --from-parent-project ../fossils/parent.fossil
fossil up trunk
fossil status
fossil timeline -b trunk
fossil ls
echo '== closing branch'
bad=$(fossil timeline -F '%h %c' | grep BAD | awk '{print $1}')
fossil amend $bad --branch mistake -m 'shunt bad series of commits'
fossil up trunk
fossil status
fossil timeline -b trunk
fossil ls
echo $work
|