Mercurial > hg
view tests/test-debugcommands.t @ 21541:6062593d8b06
resolve: don't abort resolve -l even when no merge is in progress
This broke some internal automation that was quite reasonably checking for
unresolved files as a way to determine whether a merge happened cleanly. We
still abort for resolve --mark etc.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 23 May 2014 13:10:31 -0700 |
parents | 01df3660eb11 |
children | 76effa770ff9 |
line wrap: on
line source
$ hg init debugrevlog $ cd debugrevlog $ echo a > a $ hg ci -Am adda adding a $ hg debugrevlog -m format : 1 flags : inline revisions : 1 merges : 0 ( 0.00%) normal : 1 (100.00%) revisions : 1 full : 1 (100.00%) deltas : 0 ( 0.00%) revision size : 44 full : 44 (100.00%) deltas : 0 ( 0.00%) avg chain length : 0 compression ratio : 0 uncompressed data size (min/max/avg) : 43 / 43 / 43 full revision size (min/max/avg) : 44 / 44 / 44 delta size (min/max/avg) : 0 / 0 / 0 Test internal debugstacktrace command $ cat > debugstacktrace.py << EOF > from mercurial.util import debugstacktrace, dst, sys > def f(): > dst('hello world') > def g(): > f() > debugstacktrace(skip=-5, f=sys.stdout) > g() > EOF $ python debugstacktrace.py hello world at: debugstacktrace.py:7 in * (glob) debugstacktrace.py:5 in g debugstacktrace.py:3 in f stacktrace at: debugstacktrace.py:7 *in * (glob) debugstacktrace.py:6 *in g (glob) */util.py:* in debugstacktrace (glob)