Mercurial > hg
view tests/test-default-push @ 5503:6f26c7677463
Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 02 Nov 2007 14:02:28 -0700 |
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/'