Mercurial > hg
view tests/test-merge10 @ 11566:4d11fde55cc5
util: use fakebuffer as buffer in py3k
There's no buffer type in py3k, util.py has a function, called
fakebuffer, that implements a similar API. This patch implements
fakebuffer as a memoryview wrapper in py3k.
author | Renato Cunha <renatoc@gmail.com> |
---|---|
date | Wed, 14 Jul 2010 22:59:57 -0300 |
parents | 8766fee6f225 |
children |
line wrap: on
line source
#!/bin/sh # Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb # (merge correctly when all the files in a directory are moved # but then local changes are added in the same directory) hg init a cd a mkdir -p testdir echo a > testdir/a hg add testdir/a hg commit -d '1000000 0' -m a cd .. hg clone a b cd a echo alpha > testdir/a hg commit -d '1000000 0' -m remote-change cd .. cd b mkdir testdir/subdir hg mv testdir/a testdir/subdir/a hg commit -d '1000000 0' -m move mkdir newdir echo beta > newdir/beta hg add newdir/beta hg commit -d '1000000 0' -m local-addition hg pull ../a hg up -C 2 hg merge hg stat hg diff --nodates