Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue612 @ 5242:466323968b23
Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 27 Aug 2007 14:21:04 -0300 |
parents | 9797124581c9 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init mkdir src echo a > src/a.c hg ci -Ama -d "10000000 0" hg mv src source hg ci -Ammove -d "1000000 0" hg co -C 0 echo new > src/a.c echo compiled > src/a.o hg ci -mupdate -d "1000000 0" hg st hg merge hg st