Mercurial > hg
view tests/test-convert @ 6297:fed1a9c22076
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | e422305e0853 |
children | d596b1f2935a |
line wrap: on
line source
#!/bin/sh cat >> $HGRCPATH <<EOF [extensions] convert= [convert] hg.saverev=False EOF hg help convert hg init a cd a echo a > a hg ci -d'0 0' -Ama hg cp a b hg ci -d'1 0' -mb hg rm a hg ci -d'2 0' -mc hg mv b a hg ci -d'3 0' -md echo a >> a hg ci -d'4 0' -me cd .. hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded' hg --cwd a-hg pull ../a touch bogusfile echo % should fail hg convert a bogusfile mkdir bogusdir chmod 000 bogusdir echo % should fail hg convert a bogusdir echo % should succeed chmod 700 bogusdir hg convert a bogusdir echo % test pre and post conversion actions echo 'include b' > filemap hg convert --debug --filemap filemap a partialb | \ grep 'run hg'