Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8 @ 3565:549cb7b640fb
Simplify ignore logic in dirstate.walk
- kill blockignore hack
- pull pconvert out of imatch
- skip imatch when not ignoring
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 27 Oct 2006 12:09:33 -0500 |
parents | efbe24c7d8d9 |
children |
line wrap: on
line source
#!/bin/sh # Test for changeset ba7c74081861 # (update dirstate correctly for non-branchmerge updates) hg init a cd a echo a > a hg add a hg commit -m a cd .. hg clone a b cd a hg mv a b hg commit -m move echo b >> b hg commit -m b cd ../b hg pull ../a hg update