Mercurial > hg
view tests/test-bisect @ 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 | 51776e50bc8c |
children | 6d904eb19c2a |
line wrap: on
line source
#!/bin/sh set -e echo % init hg init echo % committing changes count=0 echo > a while test $count -lt 32 ; do echo 'a' >> a test $count -eq 0 && hg add hg ci -m "msg $count" -d "$count 0" echo % committed changeset $count count=`expr $count + 1` done echo % log hg log echo % hg up -C hg up -C echo % bisect test hg bisect -r hg bisect -b hg bisect -g 1 hg bisect -g echo skip hg bisect -s hg bisect -g hg bisect -g hg bisect -b hg bisect -g echo % bisect reverse test hg bisect -r hg bisect -b null hg bisect -g tip hg bisect -g echo skip hg bisect -s hg bisect -g hg bisect -g hg bisect -b hg bisect -g hg bisect -r hg bisect -g tip hg bisect -b tip || echo error hg bisect -r hg bisect -g null hg bisect -bU tip hg id