Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir @ 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 | 096f1c73cdc3 |
children | 000d122071b5 |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg ci -m "a" -d "1000000 0" echo 123 > b hg add b hg diff --nodates hg diff --nodates -r tip echo foo > a hg diff --nodates