Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-empty-file @ 4965:4106dde15aed
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 21 Jul 2007 16:44:38 -0500 |
parents | 7a7d4937272b |
children |
line wrap: on
line source
#!/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