Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-push-hook-lock @ 4358:465b9ea02868
Import 3-way merge code from bzr
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | 876e4e6ad82b |
children |
line wrap: on
line source
#!/bin/sh hg init 1 echo '[ui]' >> 1/.hg/hgrc echo 'timeout = 10' >> 1/.hg/hgrc echo foo > 1/foo hg --cwd 1 ci -A -m foo hg clone 1 2 hg clone 2 3 echo '[hooks]' >> 2/.hg/hgrc echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc echo bar >> 3/foo hg --cwd 3 ci -m bar hg --cwd 3 push ../2