Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-cat @ 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 | 7544700fd931 |
children |
line wrap: on
line source
#!/bin/sh # mkdir t cd t hg init echo 0 > a echo 0 > b hg ci -A -m m -d "1000000 0" hg rm a hg cat a sleep 1 # make sure mtime is changed echo 1 > b hg ci -m m -d "1000000 0" echo 2 > b hg cat -r 0 a hg cat -r 0 b hg cat -r 1 a hg cat -r 1 b