Mercurial > hg
annotate tests/test-bisect2.t @ 35428:71427ff1dff8
workers: handling exceptions in windows workers
This adds handling of exceptions from worker threads and resurfaces them as if the function ran without workers.
If any of the threads throws, the main thread kills all running threads giving them 5 sec to handle the interruption and raises the first exception received.
We don't have to join threads if is_alive() is false
Test Plan:
Ran multiple updates/enable/disable sparse profile and things worked well
Ran test on CentOS- all tests passing on @ passed here
Added a forged exception into the worker code and got it properly resurfaced and the rest of workers killed: P58642088
PS C:\open\<repo>> ..\facebook-hg-rpms\build\hg\hg.exe --config extensions.fsmonitor=! sparse --enable-profile <profile>
updating [==> ] 1300/39166 1m57sException in thread Thread-3:
Traceback (most recent call last):
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\threading.py", line 801, in __bootstrap_inner
self.run()
File "C:\open\facebook-hg-rpms\build\hg\mercurial\worker.py", line 244, in run
raise e
Exception: Forged exception
Exception in thread Thread-2:
Traceback (most recent call last):
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\threading.py", line 801, in __bootstrap_inner
self.run()
File "C:\open\facebook-hg-rpms\build\hg\mercurial\worker.py", line 244, in run
raise e
Exception: Forged exception
<...>
Traceback (most recent call last):
File "C:\open\facebook-hg-rpms\build\hg\hgexe.py", line 41, in <module>
dispatch.run()
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 85, in run
status = (dispatch(req) or 0) & 255
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 173, in dispatch
ret = _runcatch(req)
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 324, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 332, in _callcatch
return scmutil.callcatch(ui, func)
File "C:\open\facebook-hg-rpms\build\hg\mercurial\scmutil.py", line 154, in callcatch
return func()
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 314, in _runcatchfunc
return _dispatch(req)
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 951, in _dispatch
cmdpats, cmdoptions)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\remotefilelog\__init__.py", line 415, in runcommand
return orig(lui, repo, *args, **kwargs)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\hgext3rd\undo.py", line 118, in _runcommandwrapper
result = orig(lui, repo, cmd, fullargs, *args)
File "C:\open\facebook-hg-rpms\build\hg\hgext\journal.py", line 84, in runcommand
return orig(lui, repo, cmd, fullargs, *args)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\hgext3rd\perftweaks.py", line 268, in _tracksparseprofiles
res = runcommand(lui, repo, *args)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\hgext3rd\perftweaks.py", line 256, in _trackdirstatesizes
res = runcommand(lui, repo, *args)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\hgext3rd\copytrace.py", line 144, in _runcommand
return orig(lui, repo, cmd, fullargs, ui, *args, **kwargs)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\hgext3rd\fbamend\hiddenoverride.py", line 119, in runcommand
result = orig(lui, repo, cmd, fullargs, *args)
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 712, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 959, in _runcommand
return cmdfunc()
File "C:\open\facebook-hg-rpms\build\hg\mercurial\dispatch.py", line 948, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "C:\open\facebook-hg-rpms\build\hg\mercurial\util.py", line 1183, in check
return func(*args, **kwargs)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\hgext3rd\fbsparse.py", line 860, in sparse
disableprofile=disableprofile, force=force)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\hgext3rd\fbsparse.py", line 949, in _config
len, _refresh(ui, repo, oldstatus, oldsparsematch, force))
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\hgext3rd\fbsparse.py", line 1116, in _refresh
mergemod.applyupdates(repo, typeactions, repo[None], repo['.'], False)
File "C:\open\facebook-hg-rpms\build\hg\hg-python\lib\site-packages\remotefilelog\__init__.py", line 311, in applyupdates
return orig(repo, actions, wctx, mctx, overwrite, labels=labels)
File "C:\open\facebook-hg-rpms\build\hg\mercurial\merge.py", line 1464, in applyupdates
for i, item in prog:
File "C:\open\facebook-hg-rpms\build\hg\mercurial\worker.py", line 286, in _windowsworker
raise t.exception
Exception: Forged exception
PS C:\open\ovrsource>
Differential Revision: https://phab.mercurial-scm.org/D1459
author | Wojciech Lis <wlis@fb.com> |
---|---|
date | Mon, 20 Nov 2017 10:27:41 -0800 |
parents | 1b5c61d38a52 |
children | f51ff655d338 |
rev | line source |
---|---|
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
1 # The tests in test-bisect are done on a linear history. Here the |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
2 # following repository history is used for testing: |
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
3 # |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
4 # 17 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
5 # | |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
6 # 18 16 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
7 # \ / |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
8 # 15 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
9 # / \ |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
10 # / \ |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
11 # 10 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
12 # / \ | |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
13 # / \ | 14 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
14 # 7 6 9 12 / |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
15 # \ / \ | |/ |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
16 # 4 \ | 11 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
17 # \ \ | / |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
18 # 3 5 | / |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
19 # \ / |/ |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
20 # 2 8 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
21 # \ / |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
22 # 1 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
23 # | |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
24 # 0 |
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
25 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
26 init |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
27 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
28 $ hg init |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
29 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
30 committing changes |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
31 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
32 $ echo > a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
33 $ echo '0' >> a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
34 $ hg add a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
35 $ hg ci -m "0" -d "0 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
36 $ echo '1' >> a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
37 $ hg ci -m "1" -d "1 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
38 $ echo '2' >> a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
39 $ hg ci -m "2" -d "2 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
40 $ echo '3' >> a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
41 $ hg ci -m "3" -d "3 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
42 $ echo '4' >> a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
43 $ hg ci -m "4" -d "4 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
44 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
45 create branch |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
46 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
47 $ hg up -r 2 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
49 $ echo '5' >> b |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
50 $ hg add b |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
51 $ hg ci -m "5" -d "5 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
52 created new head |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
53 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
54 merge |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
55 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
56 $ hg merge |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
58 (branch merge, don't forget to commit) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
59 $ hg ci -m "merge 4,5" -d "6 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
60 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
61 create branch |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
62 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
63 $ hg up -r 4 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
64 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
65 $ echo '7' > c |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
66 $ hg add c |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
67 $ hg ci -m "7" -d "7 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
68 created new head |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
69 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
70 create branch |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
71 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
72 $ hg up -r 1 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
73 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
74 $ echo '8' > d |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
75 $ hg add d |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
76 $ hg ci -m "8" -d "8 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
77 created new head |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
78 $ echo '9' >> d |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
79 $ hg ci -m "9" -d "9 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
80 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
81 merge |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
82 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
83 $ hg merge -r 6 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
84 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
85 (branch merge, don't forget to commit) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
86 $ hg ci -m "merge 6,9" -d "10 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
87 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
88 create branch |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
89 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
90 $ hg up -r 8 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
91 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
92 $ echo '11' > e |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
93 $ hg add e |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
94 $ hg ci -m "11" -d "11 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
95 created new head |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
96 $ echo '12' >> e |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
97 $ hg ci -m "12" -d "12 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
98 $ echo '13' >> e |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
99 $ hg ci -m "13" -d "13 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
100 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
101 create branch |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
102 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
103 $ hg up -r 11 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
104 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
105 $ echo '14' > f |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
106 $ hg add f |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
107 $ hg ci -m "14" -d "14 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
108 created new head |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
109 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
110 merge |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
111 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
112 $ hg up -r 13 -C |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
113 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
114 $ hg merge -r 10 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
115 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
116 (branch merge, don't forget to commit) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
117 $ hg ci -m "merge 10,13" -d "15 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
118 $ echo '16' >> e |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
119 $ hg ci -m "16" -d "16 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
120 $ echo '17' >> e |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
121 $ hg ci -m "17" -d "17 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
122 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
123 create branch |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
124 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
125 $ hg up -r 15 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
126 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
127 $ echo '18' >> e |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
128 $ hg ci -m "18" -d "18 0" |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
129 created new head |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
130 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
131 log |
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
132 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
133 $ hg log |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
134 changeset: 18:d42e18c7bc9b |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
135 tag: tip |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
136 parent: 15:857b178a7cf3 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
137 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
138 date: Thu Jan 01 00:00:18 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
139 summary: 18 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
140 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
141 changeset: 17:228c06deef46 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
142 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
143 date: Thu Jan 01 00:00:17 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
144 summary: 17 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
145 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
146 changeset: 16:609d82a7ebae |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
147 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
148 date: Thu Jan 01 00:00:16 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
149 summary: 16 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
150 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
151 changeset: 15:857b178a7cf3 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
152 parent: 13:b0a32c86eb31 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
153 parent: 10:429fcd26f52d |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
154 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
155 date: Thu Jan 01 00:00:15 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
156 summary: merge 10,13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
157 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
158 changeset: 14:faa450606157 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
159 parent: 11:82ca6f06eccd |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
160 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
161 date: Thu Jan 01 00:00:14 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
162 summary: 14 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
163 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
164 changeset: 13:b0a32c86eb31 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
165 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
166 date: Thu Jan 01 00:00:13 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
167 summary: 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
168 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
169 changeset: 12:9f259202bbe7 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
170 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
171 date: Thu Jan 01 00:00:12 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
172 summary: 12 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
173 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
174 changeset: 11:82ca6f06eccd |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
175 parent: 8:dab8161ac8fc |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
176 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
177 date: Thu Jan 01 00:00:11 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
178 summary: 11 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
179 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
180 changeset: 10:429fcd26f52d |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
181 parent: 9:3c77083deb4a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
182 parent: 6:a214d5d3811a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
183 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
184 date: Thu Jan 01 00:00:10 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
185 summary: merge 6,9 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
186 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
187 changeset: 9:3c77083deb4a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
188 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
189 date: Thu Jan 01 00:00:09 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
190 summary: 9 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
191 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
192 changeset: 8:dab8161ac8fc |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
193 parent: 1:4ca5088da217 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
194 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
195 date: Thu Jan 01 00:00:08 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
196 summary: 8 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
197 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
198 changeset: 7:50c76098bbf2 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
199 parent: 4:5c668c22234f |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
200 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
201 date: Thu Jan 01 00:00:07 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
202 summary: 7 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
203 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
204 changeset: 6:a214d5d3811a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
205 parent: 5:385a529b6670 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
206 parent: 4:5c668c22234f |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
207 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
208 date: Thu Jan 01 00:00:06 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
209 summary: merge 4,5 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
210 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
211 changeset: 5:385a529b6670 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
212 parent: 2:051e12f87bf1 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
213 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
214 date: Thu Jan 01 00:00:05 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
215 summary: 5 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
216 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
217 changeset: 4:5c668c22234f |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
218 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
219 date: Thu Jan 01 00:00:04 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
220 summary: 4 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
221 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
222 changeset: 3:0950834f0a9c |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
223 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
224 date: Thu Jan 01 00:00:03 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
225 summary: 3 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
226 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
227 changeset: 2:051e12f87bf1 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
228 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
229 date: Thu Jan 01 00:00:02 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
230 summary: 2 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
231 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
232 changeset: 1:4ca5088da217 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
233 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
234 date: Thu Jan 01 00:00:01 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
235 summary: 1 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
236 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
237 changeset: 0:33b1f9bc8bc5 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
238 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
239 date: Thu Jan 01 00:00:00 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
240 summary: 0 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
241 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
242 |
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
243 hg up -C |
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
244 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
245 $ hg up -C |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28029
diff
changeset
|
247 updated to "d42e18c7bc9b: 18" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
15153
diff
changeset
|
248 3 other heads for branch "default" |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
249 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
250 complex bisect test 1 # first bad rev is 9 |
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
251 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
252 $ hg bisect -r |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
253 $ hg bisect -g 0 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
254 $ hg bisect -b 17 # -> update to rev 6 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
255 Testing changeset 6:a214d5d3811a (15 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
256 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
257 $ hg log -q -r 'bisect(pruned)' |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
258 0:33b1f9bc8bc5 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
259 17:228c06deef46 |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
260 $ hg log -q -r 'bisect(untested)' |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
261 1:4ca5088da217 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
262 2:051e12f87bf1 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
263 3:0950834f0a9c |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
264 4:5c668c22234f |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
265 5:385a529b6670 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
266 6:a214d5d3811a |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
267 8:dab8161ac8fc |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
268 9:3c77083deb4a |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
269 10:429fcd26f52d |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
270 11:82ca6f06eccd |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
271 12:9f259202bbe7 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
272 13:b0a32c86eb31 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
273 15:857b178a7cf3 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
274 16:609d82a7ebae |
15147
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
275 $ hg log -q -r 'bisect(ignored)' |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
276 $ hg bisect -g # -> update to rev 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
277 Testing changeset 13:b0a32c86eb31 (9 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
278 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
279 $ hg bisect -s # -> update to rev 10 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
280 Testing changeset 10:429fcd26f52d (9 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
281 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
282 $ hg bisect -b # -> update to rev 8 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
283 Testing changeset 8:dab8161ac8fc (3 changesets remaining, ~1 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
284 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
285 $ hg bisect -g # -> update to rev 9 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
286 Testing changeset 9:3c77083deb4a (2 changesets remaining, ~1 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
288 $ hg bisect -b |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
289 The first bad revision is: |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
290 changeset: 9:3c77083deb4a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
291 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
292 date: Thu Jan 01 00:00:09 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
293 summary: 9 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
294 |
15136
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
295 $ hg log -q -r 'bisect(range)' |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
296 0:33b1f9bc8bc5 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
297 1:4ca5088da217 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
298 2:051e12f87bf1 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
299 3:0950834f0a9c |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
300 4:5c668c22234f |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
301 5:385a529b6670 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
302 6:a214d5d3811a |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
303 8:dab8161ac8fc |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
304 9:3c77083deb4a |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
305 10:429fcd26f52d |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
306 11:82ca6f06eccd |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
307 12:9f259202bbe7 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
308 13:b0a32c86eb31 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
309 15:857b178a7cf3 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
310 16:609d82a7ebae |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
311 17:228c06deef46 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
312 $ hg log -q -r 'bisect(pruned)' |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
313 0:33b1f9bc8bc5 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
314 1:4ca5088da217 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
315 2:051e12f87bf1 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
316 3:0950834f0a9c |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
317 4:5c668c22234f |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
318 5:385a529b6670 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
319 6:a214d5d3811a |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
320 8:dab8161ac8fc |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
321 9:3c77083deb4a |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
322 10:429fcd26f52d |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
323 13:b0a32c86eb31 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
324 15:857b178a7cf3 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
325 16:609d82a7ebae |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
326 17:228c06deef46 |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
327 18:d42e18c7bc9b |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
328 $ hg log -q -r 'bisect(untested)' |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
329 11:82ca6f06eccd |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
330 12:9f259202bbe7 |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
331 $ hg log -q -r 'bisect(goods)' |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
332 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
333 1:4ca5088da217 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
334 2:051e12f87bf1 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
335 3:0950834f0a9c |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
336 4:5c668c22234f |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
337 5:385a529b6670 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
338 6:a214d5d3811a |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
339 8:dab8161ac8fc |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
340 $ hg log -q -r 'bisect(bads)' |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
341 9:3c77083deb4a |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
342 10:429fcd26f52d |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
343 15:857b178a7cf3 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
344 16:609d82a7ebae |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
345 17:228c06deef46 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
346 18:d42e18c7bc9b |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
347 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
348 complex bisect test 2 # first good rev is 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
349 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
350 $ hg bisect -r |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
351 $ hg bisect -g 18 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
352 $ hg bisect -b 1 # -> update to rev 6 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
353 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
354 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
355 $ hg bisect -s # -> update to rev 10 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
356 Testing changeset 10:429fcd26f52d (13 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
357 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
358 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
359 0:33b1f9bc8bc5 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
360 1:4ca5088da217 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
361 6:a214d5d3811a |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
362 18:d42e18c7bc9b |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
363 $ hg bisect -b # -> update to rev 12 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
364 Testing changeset 12:9f259202bbe7 (5 changesets remaining, ~2 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
365 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
366 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
367 0:33b1f9bc8bc5 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
368 1:4ca5088da217 |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
369 2:051e12f87bf1 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
370 3:0950834f0a9c |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
371 4:5c668c22234f |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
372 5:385a529b6670 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
373 6:a214d5d3811a |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
374 8:dab8161ac8fc |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
375 9:3c77083deb4a |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
376 10:429fcd26f52d |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
377 18:d42e18c7bc9b |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
378 $ hg log -q -r 'bisect(untested)' |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
379 11:82ca6f06eccd |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
380 12:9f259202bbe7 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
381 13:b0a32c86eb31 |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
382 15:857b178a7cf3 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
383 $ hg bisect -b # -> update to rev 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
384 Testing changeset 13:b0a32c86eb31 (3 changesets remaining, ~1 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
385 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
386 $ hg bisect -g |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
387 The first good revision is: |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
388 changeset: 13:b0a32c86eb31 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
389 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
390 date: Thu Jan 01 00:00:13 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
391 summary: 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
392 |
15136
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
393 $ hg log -q -r 'bisect(range)' |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
394 1:4ca5088da217 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
395 2:051e12f87bf1 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
396 3:0950834f0a9c |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
397 4:5c668c22234f |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
398 5:385a529b6670 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
399 6:a214d5d3811a |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
400 8:dab8161ac8fc |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
401 9:3c77083deb4a |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
402 10:429fcd26f52d |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
403 11:82ca6f06eccd |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
404 12:9f259202bbe7 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
405 13:b0a32c86eb31 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
406 15:857b178a7cf3 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
407 18:d42e18c7bc9b |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
408 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
409 complex bisect test 3 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
410 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
411 first bad rev is 15 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
412 10,9,13 are skipped an might be the first bad revisions as well |
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
413 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
414 $ hg bisect -r |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
415 $ hg bisect -g 1 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
416 $ hg bisect -b 16 # -> update to rev 6 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
417 Testing changeset 6:a214d5d3811a (13 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
418 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
419 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
420 0:33b1f9bc8bc5 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
421 1:4ca5088da217 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
422 16:609d82a7ebae |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
423 17:228c06deef46 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
424 $ hg bisect -g # -> update to rev 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
425 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
426 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
427 $ hg bisect -s # -> update to rev 10 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
428 Testing changeset 10:429fcd26f52d (8 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
429 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
430 $ hg bisect -s # -> update to rev 12 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
431 Testing changeset 12:9f259202bbe7 (8 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
432 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
433 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
434 0:33b1f9bc8bc5 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
435 1:4ca5088da217 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
436 2:051e12f87bf1 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
437 3:0950834f0a9c |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
438 4:5c668c22234f |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
439 5:385a529b6670 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
440 6:a214d5d3811a |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
441 10:429fcd26f52d |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
442 13:b0a32c86eb31 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
443 16:609d82a7ebae |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
444 17:228c06deef46 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
445 $ hg bisect -g # -> update to rev 9 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
446 Testing changeset 9:3c77083deb4a (5 changesets remaining, ~2 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
447 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
448 $ hg bisect -s # -> update to rev 15 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
449 Testing changeset 15:857b178a7cf3 (5 changesets remaining, ~2 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
450 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15147
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
451 $ hg log -q -r 'bisect(ignored)' |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
452 $ hg bisect -b |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
453 Due to skipped revisions, the first bad revision could be any of: |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
454 changeset: 9:3c77083deb4a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
455 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
456 date: Thu Jan 01 00:00:09 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
457 summary: 9 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
458 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
459 changeset: 10:429fcd26f52d |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
460 parent: 9:3c77083deb4a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
461 parent: 6:a214d5d3811a |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
462 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
463 date: Thu Jan 01 00:00:10 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
464 summary: merge 6,9 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
465 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
466 changeset: 13:b0a32c86eb31 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
467 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
468 date: Thu Jan 01 00:00:13 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
469 summary: 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
470 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
471 changeset: 15:857b178a7cf3 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
472 parent: 13:b0a32c86eb31 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
473 parent: 10:429fcd26f52d |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
474 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
475 date: Thu Jan 01 00:00:15 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
476 summary: merge 10,13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
477 |
15136
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
478 $ hg log -q -r 'bisect(range)' |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
479 1:4ca5088da217 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
480 2:051e12f87bf1 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
481 3:0950834f0a9c |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
482 4:5c668c22234f |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
483 5:385a529b6670 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
484 6:a214d5d3811a |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
485 8:dab8161ac8fc |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
486 9:3c77083deb4a |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
487 10:429fcd26f52d |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
488 11:82ca6f06eccd |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
489 12:9f259202bbe7 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
490 13:b0a32c86eb31 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
491 15:857b178a7cf3 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
492 16:609d82a7ebae |
15147
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
493 $ hg log -q -r 'bisect(ignored)' |
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
494 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
495 complex bisect test 4 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
496 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
497 first good revision is 17 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
498 15,16 are skipped an might be the first good revisions as well |
6859
9369095779a1
add additional complex bisect tests (with non-linear history)
Bernhard Leiner <bleiner@gmail.com>
parents:
diff
changeset
|
499 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
500 $ hg bisect -r |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
501 $ hg bisect -g 17 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
502 $ hg bisect -b 8 # -> update to rev 10 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
503 Testing changeset 13:b0a32c86eb31 (8 changesets remaining, ~3 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
504 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
505 $ hg bisect -b # -> update to rev 13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
506 Testing changeset 10:429fcd26f52d (5 changesets remaining, ~2 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
507 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
508 $ hg bisect -b # -> update to rev 15 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
509 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
510 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
511 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
512 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
513 1:4ca5088da217 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
514 2:051e12f87bf1 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
515 3:0950834f0a9c |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
516 4:5c668c22234f |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
517 5:385a529b6670 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
518 6:a214d5d3811a |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
519 8:dab8161ac8fc |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
520 9:3c77083deb4a |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
521 10:429fcd26f52d |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
522 11:82ca6f06eccd |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
523 12:9f259202bbe7 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
524 13:b0a32c86eb31 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
525 17:228c06deef46 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
526 $ hg bisect -s # -> update to rev 16 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
527 Testing changeset 16:609d82a7ebae (3 changesets remaining, ~1 tests) |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
528 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
529 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
530 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
531 1:4ca5088da217 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
532 2:051e12f87bf1 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
533 3:0950834f0a9c |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
534 4:5c668c22234f |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
535 5:385a529b6670 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
536 6:a214d5d3811a |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
537 8:dab8161ac8fc |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
538 9:3c77083deb4a |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
539 10:429fcd26f52d |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
540 11:82ca6f06eccd |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
541 12:9f259202bbe7 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
542 13:b0a32c86eb31 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
543 15:857b178a7cf3 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
544 17:228c06deef46 |
11860
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
545 $ hg bisect -s |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
546 Due to skipped revisions, the first good revision could be any of: |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
547 changeset: 15:857b178a7cf3 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
548 parent: 13:b0a32c86eb31 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
549 parent: 10:429fcd26f52d |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
550 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
551 date: Thu Jan 01 00:00:15 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
552 summary: merge 10,13 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
553 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
554 changeset: 16:609d82a7ebae |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
555 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
556 date: Thu Jan 01 00:00:16 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
557 summary: 16 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
558 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
559 changeset: 17:228c06deef46 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
560 user: test |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
561 date: Thu Jan 01 00:00:17 1970 +0000 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
562 summary: 17 |
56c7c3209e1a
tests: unify test-bisect2
Martin Geisler <mg@lazybytes.net>
parents:
6859
diff
changeset
|
563 |
15136
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
564 $ hg log -q -r 'bisect(range)' |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
565 8:dab8161ac8fc |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
566 9:3c77083deb4a |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
567 10:429fcd26f52d |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
568 11:82ca6f06eccd |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
569 12:9f259202bbe7 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
570 13:b0a32c86eb31 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
571 15:857b178a7cf3 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
572 16:609d82a7ebae |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
573 17:228c06deef46 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
574 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
575 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
576 1:4ca5088da217 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
577 2:051e12f87bf1 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
578 3:0950834f0a9c |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
579 4:5c668c22234f |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
580 5:385a529b6670 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
581 6:a214d5d3811a |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
582 8:dab8161ac8fc |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
583 9:3c77083deb4a |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
584 10:429fcd26f52d |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
585 11:82ca6f06eccd |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
586 12:9f259202bbe7 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
587 13:b0a32c86eb31 |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
588 15:857b178a7cf3 |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
589 16:609d82a7ebae |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
590 17:228c06deef46 |
12007
652f71b235bf
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents:
11860
diff
changeset
|
591 |
652f71b235bf
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents:
11860
diff
changeset
|
592 test unrelated revs: |
652f71b235bf
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents:
11860
diff
changeset
|
593 |
652f71b235bf
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents:
11860
diff
changeset
|
594 $ hg bisect --reset |
652f71b235bf
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents:
11860
diff
changeset
|
595 $ hg bisect -b 7 |
652f71b235bf
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents:
11860
diff
changeset
|
596 $ hg bisect -g 14 |
652f71b235bf
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents:
11860
diff
changeset
|
597 abort: starting revisions are not directly related |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12178
diff
changeset
|
598 [255] |
15136
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
599 $ hg log -q -r 'bisect(range)' |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
600 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
601 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
602 1:4ca5088da217 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
603 2:051e12f87bf1 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
604 3:0950834f0a9c |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
605 4:5c668c22234f |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
606 7:50c76098bbf2 |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
607 14:faa450606157 |
12007
652f71b235bf
bisect: add test for unrelated starting revisions
Matt Mackall <mpm@selenic.com>
parents:
11860
diff
changeset
|
608 $ hg bisect --reset |
12178
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
609 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
610 end at merge: 17 bad, 11 good (but 9 is first bad) |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
611 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
612 $ hg bisect -r |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
613 $ hg bisect -b 17 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
614 $ hg bisect -g 11 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
615 Testing changeset 13:b0a32c86eb31 (5 changesets remaining, ~2 tests) |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
616 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15147
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
617 $ hg log -q -r 'bisect(ignored)' |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
618 2:051e12f87bf1 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
619 3:0950834f0a9c |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
620 4:5c668c22234f |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
621 5:385a529b6670 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
622 6:a214d5d3811a |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
623 9:3c77083deb4a |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
624 10:429fcd26f52d |
12178
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
625 $ hg bisect -g |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
626 Testing changeset 15:857b178a7cf3 (3 changesets remaining, ~1 tests) |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
627 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
628 $ hg bisect -b |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
629 The first bad revision is: |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
630 changeset: 15:857b178a7cf3 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
631 parent: 13:b0a32c86eb31 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
632 parent: 10:429fcd26f52d |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
633 user: test |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
634 date: Thu Jan 01 00:00:15 1970 +0000 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
635 summary: merge 10,13 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
636 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
637 Not all ancestors of this changeset have been checked. |
13601
0388e3e36693
bisect: new command to extend the bisect range (issue2690)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12316
diff
changeset
|
638 Use bisect --extend to continue the bisection from |
0388e3e36693
bisect: new command to extend the bisect range (issue2690)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12316
diff
changeset
|
639 the common ancestor, dab8161ac8fc. |
15136
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
640 $ hg log -q -r 'bisect(range)' |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
641 11:82ca6f06eccd |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
642 12:9f259202bbe7 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
643 13:b0a32c86eb31 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
644 15:857b178a7cf3 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
645 16:609d82a7ebae |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
646 17:228c06deef46 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
647 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
648 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
649 1:4ca5088da217 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
650 8:dab8161ac8fc |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
651 11:82ca6f06eccd |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
652 12:9f259202bbe7 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
653 13:b0a32c86eb31 |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
654 15:857b178a7cf3 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
655 16:609d82a7ebae |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
656 17:228c06deef46 |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
657 18:d42e18c7bc9b |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
658 $ hg log -q -r 'bisect(untested)' |
15147
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
659 $ hg log -q -r 'bisect(ignored)' |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
660 2:051e12f87bf1 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
661 3:0950834f0a9c |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
662 4:5c668c22234f |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
663 5:385a529b6670 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
664 6:a214d5d3811a |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
665 9:3c77083deb4a |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
666 10:429fcd26f52d |
13601
0388e3e36693
bisect: new command to extend the bisect range (issue2690)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12316
diff
changeset
|
667 $ hg bisect --extend |
0388e3e36693
bisect: new command to extend the bisect range (issue2690)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12316
diff
changeset
|
668 Extending search to changeset 8:dab8161ac8fc |
0388e3e36693
bisect: new command to extend the bisect range (issue2690)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12316
diff
changeset
|
669 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
670 $ hg log -q -r 'bisect(untested)' |
15147
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
671 $ hg log -q -r 'bisect(ignored)' |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
672 2:051e12f87bf1 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
673 3:0950834f0a9c |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
674 4:5c668c22234f |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
675 5:385a529b6670 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
676 6:a214d5d3811a |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
677 9:3c77083deb4a |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
678 10:429fcd26f52d |
13601
0388e3e36693
bisect: new command to extend the bisect range (issue2690)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12316
diff
changeset
|
679 $ hg bisect -g # dab8161ac8fc |
12178
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
680 Testing changeset 9:3c77083deb4a (3 changesets remaining, ~1 tests) |
13601
0388e3e36693
bisect: new command to extend the bisect range (issue2690)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
12316
diff
changeset
|
681 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
682 $ hg log -q -r 'bisect(untested)' |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
683 9:3c77083deb4a |
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
684 10:429fcd26f52d |
15147
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
685 $ hg log -q -r 'bisect(ignored)' |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
686 2:051e12f87bf1 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
687 3:0950834f0a9c |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
688 4:5c668c22234f |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
689 5:385a529b6670 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
690 6:a214d5d3811a |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
691 $ hg log -q -r 'bisect(goods)' |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
692 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
693 1:4ca5088da217 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
694 8:dab8161ac8fc |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
695 11:82ca6f06eccd |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
696 12:9f259202bbe7 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
697 13:b0a32c86eb31 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
698 $ hg log -q -r 'bisect(bads)' |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
699 15:857b178a7cf3 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
700 16:609d82a7ebae |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
701 17:228c06deef46 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
702 18:d42e18c7bc9b |
12178
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
703 $ hg bisect -b |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
704 The first bad revision is: |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
705 changeset: 9:3c77083deb4a |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
706 user: test |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
707 date: Thu Jan 01 00:00:09 1970 +0000 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
708 summary: 9 |
1ef9b0b5efec
bisect: warn about ending on a merge with only one side marked
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
12007
diff
changeset
|
709 |
15136
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
710 $ hg log -q -r 'bisect(range)' |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
711 8:dab8161ac8fc |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
712 9:3c77083deb4a |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
713 10:429fcd26f52d |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
714 11:82ca6f06eccd |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
715 12:9f259202bbe7 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
716 13:b0a32c86eb31 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
717 15:857b178a7cf3 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
718 16:609d82a7ebae |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
719 17:228c06deef46 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
720 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
721 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
722 1:4ca5088da217 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
723 8:dab8161ac8fc |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
724 9:3c77083deb4a |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
725 10:429fcd26f52d |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
726 11:82ca6f06eccd |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
727 12:9f259202bbe7 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
728 13:b0a32c86eb31 |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
729 15:857b178a7cf3 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
730 16:609d82a7ebae |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
731 17:228c06deef46 |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
732 18:d42e18c7bc9b |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
733 $ hg log -q -r 'bisect(untested)' |
15147
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
734 $ hg log -q -r 'bisect(ignored)' |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
735 2:051e12f87bf1 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
736 3:0950834f0a9c |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
737 4:5c668c22234f |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
738 5:385a529b6670 |
395ca8cd2669
revset.bisect: add 'ignored' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15146
diff
changeset
|
739 6:a214d5d3811a |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
740 $ hg log -q -r 'bisect(goods)' |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
741 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
742 1:4ca5088da217 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
743 8:dab8161ac8fc |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
744 11:82ca6f06eccd |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
745 12:9f259202bbe7 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
746 13:b0a32c86eb31 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
747 $ hg log -q -r 'bisect(bads)' |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
748 9:3c77083deb4a |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
749 10:429fcd26f52d |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
750 15:857b178a7cf3 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
751 16:609d82a7ebae |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
752 17:228c06deef46 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
753 18:d42e18c7bc9b |
14895
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
754 |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
755 user adds irrelevant but consistent information (here: -g 2) to bisect state |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
756 |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
757 $ hg bisect -r |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
758 $ hg bisect -b 13 |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
759 $ hg bisect -g 8 |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
760 Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests) |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
761 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
762 $ hg log -q -r 'bisect(untested)' |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
763 11:82ca6f06eccd |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
764 12:9f259202bbe7 |
14895
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
765 $ hg bisect -g 2 |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
766 Testing changeset 11:82ca6f06eccd (3 changesets remaining, ~1 tests) |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
767 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
768 $ hg log -q -r 'bisect(untested)' |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
769 11:82ca6f06eccd |
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
770 12:9f259202bbe7 |
14895
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
771 $ hg bisect -b |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
772 The first bad revision is: |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
773 changeset: 11:82ca6f06eccd |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
774 parent: 8:dab8161ac8fc |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
775 user: test |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
776 date: Thu Jan 01 00:00:11 1970 +0000 |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
777 summary: 11 |
a35d6f822e3e
hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de>
parents:
13601
diff
changeset
|
778 |
15136
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
779 $ hg log -q -r 'bisect(range)' |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
780 8:dab8161ac8fc |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
781 11:82ca6f06eccd |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
782 12:9f259202bbe7 |
18219c0789ae
revset.bisect: add new 'range' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
14895
diff
changeset
|
783 13:b0a32c86eb31 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
784 $ hg log -q -r 'bisect(pruned)' |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
785 0:33b1f9bc8bc5 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
786 1:4ca5088da217 |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
787 2:051e12f87bf1 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
788 8:dab8161ac8fc |
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
789 11:82ca6f06eccd |
15146
b39d85be78a8
hbisect.get: use simpler code with repo.set(), fix 'pruned' set
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15138
diff
changeset
|
790 12:9f259202bbe7 |
15137
91f93dcd72aa
revset.bisect: add new 'pruned' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15136
diff
changeset
|
791 13:b0a32c86eb31 |
15153
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
792 14:faa450606157 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
793 15:857b178a7cf3 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
794 16:609d82a7ebae |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
795 17:228c06deef46 |
fa0a464e4ca5
hbisect: add two new revset descriptions: 'goods' and 'bads'
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15147
diff
changeset
|
796 18:d42e18c7bc9b |
15138
883d28233a4d
revset.bisect: add new 'untested' set to the bisect keyword
"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
parents:
15137
diff
changeset
|
797 $ hg log -q -r 'bisect(untested)' |