Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-simple-update @ 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 | 0902ffece4b4 |
children | ad3d5b4367cb |
line wrap: on
line source
#!/bin/sh set -e mkdir test cd test echo foo>foo hg init hg addremove hg commit -m "1" hg verify hg clone . ../branch cd ../branch hg co echo bar>>foo hg commit -m "2" cd ../test hg pull ../branch hg verify hg co cat foo hg manifest