Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-backout @ 2485:885de96eb542
filterfiles: Search as long as the target is a prefix of current.
filterfiles was failing to find files for directory arguments if
another file existed that started with the directory name and
sorted earlier. For example, a manifest of ('foo.h', 'foo/foo')
would cause filterfiles('foo') to return nothing. This resolves
issue #294.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Fri, 23 Jun 2006 00:11:53 +0200 |
parents | 1092533fd11c |
children | 2f4addf56715 |
line wrap: on
line source
#!/bin/sh echo '# basic operation' hg init basic cd basic echo a > a hg commit -d '0 0' -A -m a echo b >> a hg commit -d '1 0' -m b hg backout -d '2 0' tip cat a echo '# file that was removed is recreated' cd .. hg init remove cd remove echo content > a hg commit -d '0 0' -A -m a hg rm a hg commit -d '1 0' -m b hg backout -d '2 0' --merge tip cat a echo '# backout of backout is as if nothing happened' hg backout -d '3 0' --merge tip cat a 2>/dev/null || echo cat: a: No such file or directory echo '# backout with merge' cd .. hg init merge cd merge echo line 1 > a hg commit -d '0 0' -A -m a echo line 2 >> a hg commit -d '1 0' -m b echo line 3 >> a hg commit -d '2 0' -m c hg backout --merge -d '3 0' 1 hg commit -d '4 0' -m d cat a exit 0