Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5 @ 3549:db946221a58a
Some clarifications for pull/push protocols:
- List file:// and static-http://
- Mention that you can pull from bundle files
- List http and https as valid push targets, but emphasize that this
feature has to be enabled.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 27 Oct 2006 15:56:34 +0200 |
parents | 39eb64b23cb5 |
children | 41989e55fa37 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo This is file a1 > a echo This is file b1 > b hg add a b hg commit -m "commit #0" -d "1000000 0" echo This is file b22 > b hg commit -m"comment #1" -d "1000000 0" hg update 0 rm b hg commit -A -m"comment #2" -d "1000000 0" # in theory, we shouldn't need the "-y" below, but it prevents # this test from hanging when "hg update" erroneously prompts the # user for "keep or delete" hg update -y 1 exit 0