Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 640:b48b91d3fb4a
Switch push over to the new scheme
Now push works transparently with any repo with lock and
addchangegroup. Currently this is local repos and ssh.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 06 Jul 2005 22:25:40 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh set -x hg init echo "nothing" > a hg add a hg commit -t ancestor -u test -d "0 0" echo "something" > a hg commit -t branch1 -u test -d "0 0" hg co 0 echo "something else" > a hg commit -t branch2 -u test -d "0 0" export HGMERGE=merge hg up -m 1 hg id grep -Ev ">>>|<<<" a hg status