Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-lock-badness @ 3387:ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 13 Oct 2006 17:58:04 -0500 |
parents | ff5c9a92f556 |
children | c0b449154a90 |
line wrap: on
line source
#!/bin/sh hg init a echo a > a/a hg --cwd a ci -A -m a hg clone a b echo b > b/b hg --cwd b ci -A -m b chmod 100 a/.hg hg --cwd b push ../a chmod 700 a/.hg