Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-push-hook-lock @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
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