Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-fetch @ 5467:521284cdbcb4
mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs
author | NIIMI Satoshi <sa2c@sa2c.net> |
---|---|
date | Thu, 11 Oct 2007 06:10:45 +0900 |
parents | 61fcd9fac434 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "fetch=" >> $HGRCPATH hg init a echo a > a/a hg --cwd a commit -d '1 0' -Ama hg clone a b hg clone a c echo b > a/b hg --cwd a commit -d '2 0' -Amb hg --cwd a parents -q echo % should pull one change hg --cwd b fetch ../a hg --cwd b parents -q echo c > c/c hg --cwd c commit -d '3 0' -Amc hg --cwd c fetch -d '4 0' -m 'automated merge' ../a ls c