author | Thomas Arendsen Hein <thomas@intevation.de> |
Mon, 20 Nov 2006 19:41:49 +0100 | |
changeset 3687 | d5dd0a2a44bc |
parent 3506 | 9de0e64545a3 |
child 3736 | ad3d5b4367cb |
permissions | -rwxr-xr-x |
#!/bin/sh hg init a cd a touch empty1 hg add empty1 hg commit -m 'add empty1' -d '1000000 0' touch empty2 hg add empty2 hg commit -m 'add empty2' -d '1000000 0' hg up -C 0 touch empty3 hg add empty3 hg commit -m 'add empty3' -d '1000000 0' hg heads hg merge 1 # before changeset 05257fd28591, we didn't notice the # empty file that came from rev 1. hg status hg commit -m merge -d '1000000 0' hg manifest tip