Mercurial > hg
view tests/test-rename-dir-merge @ 4752:cc0fb3500dd5
mercurial.spec: include various utility files from contrib/ in rpm
Files included:
hgk
convert-repo
hg-ssh
hg-viz
git-rev-tree
bash_completion
zsh_completion
mercurial.el
author | Adam Spiers <hg@adamspiers.org> |
---|---|
date | Sun, 03 Jun 2007 14:40:56 +0100 |
parents | 7b88bd88f040 |
children | dee573ba79f1 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init mkdir a echo foo > a/a echo bar > a/b hg add a hg ci -m "0" -d "0 0" hg co -C 0 hg mv a b hg ci -m "1 mv a/ b/" -d "0 0" hg co -C 0 echo baz > a/c hg add a/c hg ci -m "2 add a/c" -d "0 0" hg merge --debug 1 echo a/* b/* hg st -C hg ci -m "3 merge 2+1" -d "0 0" hg co -C 1 hg merge --debug 2 echo a/* b/* hg st -C hg ci -m "4 merge 1+2" -d "0 0"