Mercurial > hg
view tests/test-rename-dir-merge2 @ 10930:230ab9a23594
wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 16 Apr 2010 14:57:30 +0200 |
parents | c95060a5391a |
children |
line wrap: on
line source
#!/bin/sh mkdir r1 cd r1 hg init mkdir a echo foo > a/f hg add a hg ci -m "a/f == foo" cd .. hg clone r1 r2 cd r2 hg mv a b echo foo1 > b/f hg ci -m" a -> b, b/f == foo1" cd .. cd r1 mkdir a/aa echo bar > a/aa/g hg add a/aa hg ci -m "a/aa/g" hg pull ../r2 hg merge hg st -C