Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8 @ 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 | efbe24c7d8d9 |
children |
line wrap: on
line source
#!/bin/sh # Test for changeset ba7c74081861 # (update dirstate correctly for non-branchmerge updates) hg init a cd a echo a > a hg add a hg commit -m a cd .. hg clone a b cd a hg mv a b hg commit -m move echo b >> b hg commit -m b cd ../b hg pull ../a hg update