Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-globalopts @ 3733:9e67fecbfd16
merge: handle directory renames
commit: handle new copy dirstate case correctly
findcopies:
keep a map of all copies found for directory logic
add dirs filter
check for merge:followdirs config option
generate a directory move map
find files that match directory move map
manifestmerge:
add directory rename cases
applyupdates:
skip actions with None file
add "d" action
recordupdates:
add "d" action
add simple directory rename test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 30 Nov 2006 17:36:33 -0600 |
parents | 0b9ac7dfcf56 |
children | 46280c004f22 |
line wrap: on
line source
#!/bin/sh hg init a cd a echo a > a hg ci -A -d'1 0' -m a cd .. hg init b cd b echo b > b hg ci -A -d'1 0' -m b cd .. hg clone a c cd c hg pull -f ../b HGMERGE=merge hg merge cd .. echo %% -R/--repository hg -R a tip hg --repository b tip echo %% abbrev of long option hg --repo c tip echo %% --cwd hg --cwd a parents echo %% -y/--noninteractive - just be sure it is parsed hg --cwd a tip -q --noninteractive hg --cwd a tip -q -y echo %% -q/--quiet hg -R a -q tip hg -R b -q tip hg -R c --quiet parents echo %% -v/--verbose hg --cwd c head -v hg --cwd b tip --verbose echo %% --config hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo hg --cwd c --config '' tip -q hg --cwd c --config a.b tip -q hg --cwd c --config a tip -q hg --cwd c --config a.= tip -q hg --cwd c --config .b= tip -q echo %% --debug hg --cwd c log --debug echo %% --traceback hg --cwd c --config x --traceback tip 2>&1 | grep -i 'traceback' echo %% --time hg --cwd a --time tip 2>&1 | grep '^Time:' | sed 's/[0-9][0-9]*/x/g' echo %% --version hg --version -q | sed 's/version [^)]*/version xxx/' echo %% -h/--help hg -h hg --help echo %% not tested: --debugger