Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue612 @ 5443:58496354773f
Merge with crew
Those crew folks are getting lazy about pulling from upstream before
committing.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 11 Oct 2007 00:46:40 -0500 |
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