author | Patrick Mezard <pmezard@gmail.com> |
Mon, 12 Apr 2010 21:37:21 +0200 | |
changeset 10886 | 38f2ef9c134b |
parent 4659 | 7a7d4937272b |
child 12156 | 4c94b6d0fb1c |
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