Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-dir-merge2 @ 4746:6def53be19fb
buildrpm: fix rpm release number calculation
It was broken when patch queues were in use.
author | Adam Spiers <hg@adamspiers.org> |
---|---|
date | Sat, 30 Jun 2007 01:21:41 +0100 |
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