Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-default-push @ 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 | 6dbb8ae0a0b3 |
children |
line wrap: on
line source
#!/bin/sh hg init a echo a > a/a hg --cwd a ci -Ama hg clone a c hg clone a b echo b >> b/a hg --cwd b ci -mb echo % push should push to default when default-push not set hg --cwd b push | sed 's/pushing to.*/pushing/' echo % push should push to default-push when set echo 'default-push = ../c' >> b/.hg/hgrc hg --cwd b push | sed 's/pushing to.*/pushing/'