Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-dir-merge @ 5465:9873cbb134b2
mercurial.el, mq.el: remove runtime dependencies on CL package
* (require 'cl) at compile-time
* don't use map()
author | NIIMI Satoshi <sa2c@sa2c.net> |
---|---|
date | Thu, 11 Oct 2007 05:58:54 +0900 |
parents | dee573ba79f1 |
children |
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 debugrename b/c hg co -C 1 hg merge --debug 2 echo a/* b/* hg st -C hg ci -m "4 merge 1+2" -d "0 0" hg debugrename b/c