Mercurial > lxmppd-hg-xmllex / file revision
pull_from_master.sh@b1d86f89fa27
pull_from_master.sh
Thu, 27 Nov 2008 02:48:08 +0500
- author
- Waqas Hussain <waqas20@gmail.com>
- date
- Thu, 27 Nov 2008 02:48:08 +0500
- changeset 429
- b1d86f89fa27
- parent 92
- 0261260cf9a7
- permissions
- -rwxr-xr-x
Added options to limit the number of resources and for handling of resource conflicts
- core.max_resources: defaults to 10
- core.conflict_resolve: can be "random", "increment", "kick_new" and "kick_old" (default)
#!/bin/sh which hg >/dev/null || echo "You must have Mercurial (the hg command)" hg pull http://heavy-horse.co.uk:4000/
