Mercurial > hg
view tests/test-hup @ 3509:9de0e64545a3
Test that we notice the empty files from the second parent during a merge
This didn't work with 0.9.1, but was fixed by 05257fd28591.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 25 Oct 2006 02:51:27 -0300 |
parents | 9419855309cd |
children | c0b449154a90 |
line wrap: on
line source
#!/bin/sh hg init mkfifo p hg serve --stdio < p & P=$! (echo lock; echo addchangegroup; sleep 5) > p & Q=$! sleep 3 kill -HUP $P wait ls .hg