author | Thomas Arendsen Hein <thomas@intevation.de> |
Thu, 07 Jun 2007 12:41:12 +0200 | |
changeset 4518 | 3e4aa4c9efe4 |
parent 3736 | ad3d5b4367cb |
child 4659 | 7a7d4937272b |
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 --debug tip