author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
Sat, 17 Feb 2007 09:54:59 -0200 | |
changeset 4105 | ed46895aa38c |
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