Mercurial > hgbook
view en/examples/rename.divergent @ 241:09d5897ad935
Fix a few more errors in the index.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun, 27 May 2007 09:57:17 -0700 |
parents | 91a936be78b8 |
children | 3b640272a966 |
line wrap: on
line source
#!/bin/bash hg init orig cd orig echo foo > foo hg ci -A -m 'First commit' cd .. #$ name: clone hg clone orig anne hg clone orig bob #$ name: rename.anne cd anne hg mv foo bar hg ci -m 'Rename foo to bar' #$ name: rename.bob cd ../bob hg mv foo quux hg ci -m 'Rename foo to quux' #$ name: merge # See http://www.selenic.com/mercurial/bts/issue455 cd ../orig hg pull -u ../anne hg pull ../bob hg merge ls