Mercurial > evolve
annotate tests/test-stablerange-branchpoint.t @ 6889:a66cf9008781
obslog: also display patch for rebased changesets
This applies the same logic that is used for "merge-diff" to rebased
changesets. The successors' content is compared to the content of the
predecessors rebased in-memory on the new parents.
This highlights the changes that were actually introduced while rebasing (like
conflict resolution or API adjustment).
As a side effect, obslog now also outputs slightly more diffs for splits,
showing what parts of the original big changeset were moved to the smaller
split components (but for now it only works for the first few changesets).
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 22 Sep 2024 02:58:54 +0200 |
parents | 530c7eaa9d57 |
children |
rev | line source |
---|---|
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 Test for stable ordering capabilities |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 ===================================== |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
3 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 $ . $TESTDIR/testlib/pythonpath.sh |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 $ cat << EOF >> $HGRCPATH |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 > [extensions] |
5967
39739c2257e3
tests: there's no need to have hgext3rd. before extension name either
Anton Shestakov <av6@dwimlabs.net>
parents:
3258
diff
changeset
|
8 > evolve = |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 > [ui] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 > logtemplate = "{rev} {node|short} {desc} {tags}\n" |
5991
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
11 > EOF |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
12 |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
13 #testcases basic-branchpoint branchpoint |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
14 |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
15 #if basic-branchpoint |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
16 $ cat << EOF >> $HGRCPATH |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
17 > [defaults] |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
18 > debug::evo-ext-stable-range = --method basic-branchpoint |
5991
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
19 > EOF |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
20 #endif |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
21 |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
22 #if branchpoint |
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
23 $ cat << EOF >> $HGRCPATH |
3249
94f80f229a89
stable-branch: setup tests to use a specific method by default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3236
diff
changeset
|
24 > [defaults] |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
25 > debug::evo-ext-stable-range = --method branchpoint |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
26 > EOF |
5991
79a63cc9757e
tests: add the other methods for debugstablerange as test cases
Anton Shestakov <av6@dwimlabs.net>
parents:
5967
diff
changeset
|
27 #endif |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
28 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 Simple linear test |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
30 ================== |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 $ hg init repo_linear |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 $ cd repo_linear |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 $ hg debugbuilddag '.+6' |
3236
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
35 $ hg debugdepth -r 'all()' |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
36 1ea73414a91b 1 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
37 66f7d451a68b 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
38 01241442b3c2 3 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
39 2dc09a01254d 4 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
40 bebd167eb94d 5 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
41 c8d03c1b5e94 6 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
42 f69452c5b1af 7 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
43 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev 1 | tee 1.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
44 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
45 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
46 66f7d451a68b-1 (1, 2, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
47 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
48 bigger subset reuse most of the previous one |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
49 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
50 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev 4 | tee 4.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
51 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
52 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
53 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
54 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
55 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
56 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
57 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
58 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
59 bebd167eb94d-4 (4, 5, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
60 $ diff -u 1.range 4.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
61 --- 1.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
62 +++ 4.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
63 @@ -1,3 +1,9 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
64 +bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
65 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
66 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
67 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
68 +01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
69 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
70 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
71 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
72 +bebd167eb94d-4 (4, 5, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
73 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
74 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
75 Using a range not ending on 2**N boundary |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
76 we fall back on 2**N as much as possible |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
77 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
78 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev 5 | tee 5.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
79 c8d03c1b5e94-0 (5, 6, 6) [complete] - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
80 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
81 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
82 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
83 c8d03c1b5e94-4 (5, 6, 2) [complete] - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
84 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
85 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
86 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
87 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
88 bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
89 c8d03c1b5e94-5 (5, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
90 $ diff -u 4.range 5.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
91 --- 4.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
92 +++ 5.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
93 @@ -1,9 +1,11 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
94 -bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
95 +c8d03c1b5e94-0 (5, 6, 6) [complete] - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
96 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
97 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
98 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
99 +c8d03c1b5e94-4 (5, 6, 2) [complete] - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
100 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
101 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
102 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
103 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
104 bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
105 +c8d03c1b5e94-5 (5, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
106 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
107 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
108 Even two unperfect range overlap a lot |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
109 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
110 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev tip | tee tip.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
111 f69452c5b1af-0 (6, 7, 7) [complete] - 2dc09a01254d-0 (3, 4, 4), f69452c5b1af-4 (6, 7, 3) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
112 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
113 f69452c5b1af-4 (6, 7, 3) [complete] - c8d03c1b5e94-4 (5, 6, 2), f69452c5b1af-6 (6, 7, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
114 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
115 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
116 c8d03c1b5e94-4 (5, 6, 2) [complete] - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
117 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
118 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
119 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
120 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
121 bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
122 c8d03c1b5e94-5 (5, 6, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
123 f69452c5b1af-6 (6, 7, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
124 $ diff -u 5.range tip.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
125 --- 5.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
126 +++ tip.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
127 @@ -1,5 +1,6 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
128 -c8d03c1b5e94-0 (5, 6, 6) [complete] - 2dc09a01254d-0 (3, 4, 4), c8d03c1b5e94-4 (5, 6, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
129 +f69452c5b1af-0 (6, 7, 7) [complete] - 2dc09a01254d-0 (3, 4, 4), f69452c5b1af-4 (6, 7, 3) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
130 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
131 +f69452c5b1af-4 (6, 7, 3) [complete] - c8d03c1b5e94-4 (5, 6, 2), f69452c5b1af-6 (6, 7, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
132 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
133 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
134 c8d03c1b5e94-4 (5, 6, 2) [complete] - bebd167eb94d-4 (4, 5, 1), c8d03c1b5e94-5 (5, 6, 1) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
135 @@ -9,3 +10,4 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
136 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
137 bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
138 c8d03c1b5e94-5 (5, 6, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
139 +f69452c5b1af-6 (6, 7, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
140 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
141 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
142 $ cd .. |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
143 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
144 Case with merge |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
145 =============== |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
146 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
147 Simple case: branching is on a boundary |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
148 -------------------------------------------- |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
149 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
150 $ hg init repo_merge_split_on_boundary |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
151 $ cd repo_merge_split_on_boundary |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
152 $ hg debugbuilddag '.:base |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
153 > +3:left |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
154 > <base+3:right |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
155 > <left/right:merge |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
156 > +2:head |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
157 > ' |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
158 $ hg log -G |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
159 o 9 0338daf18215 r9 head tip |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
160 | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
161 o 8 71b32fcf3f71 r8 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
162 | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
163 o 7 5f18015f9110 r7 merge |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
164 |\ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
165 | o 6 a2f58e9c1e56 r6 right |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
166 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
167 | o 5 3a367db1fabc r5 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
168 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
169 | o 4 e7bd5218ca15 r4 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
170 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
171 o | 3 2dc09a01254d r3 left |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
172 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
173 o | 2 01241442b3c2 r2 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
174 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
175 o | 1 66f7d451a68b r1 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
176 |/ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
177 o 0 1ea73414a91b r0 base |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
178 |
3236
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
179 $ hg debugdepth -r 'all()' |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
180 1ea73414a91b 1 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
181 66f7d451a68b 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
182 01241442b3c2 3 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
183 2dc09a01254d 4 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
184 e7bd5218ca15 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
185 3a367db1fabc 3 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
186 a2f58e9c1e56 4 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
187 5f18015f9110 8 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
188 71b32fcf3f71 9 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
189 0338daf18215 10 |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
190 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
191 Each of the linear branch reuse range internally |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
192 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
193 (left branch) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
194 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
195 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev 'left~2' | tee left-2.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
196 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
197 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
198 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
199 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev left | tee left.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
200 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
201 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
202 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
203 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
204 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
205 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
206 66f7d451a68b-1 (1, 2, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
207 $ diff -u left-2.range left.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
208 --- left-2.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
209 +++ left.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
210 @@ -1,3 +1,7 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
211 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
212 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
213 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
214 +01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
215 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
216 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
217 66f7d451a68b-1 (1, 2, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
218 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
219 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
220 (right branch) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
221 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
222 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev right~2 | tee right-2.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
223 e7bd5218ca15-0 (4, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
224 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
225 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
226 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev right | tee right.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
227 a2f58e9c1e56-0 (6, 4, 4) [complete] - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
228 a2f58e9c1e56-2 (6, 4, 2) [complete] - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
229 e7bd5218ca15-0 (4, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
230 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
231 3a367db1fabc-2 (5, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
232 a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
233 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
234 $ diff -u right-2.range right.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
235 --- right-2.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
236 +++ right.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
237 @@ -1,3 +1,7 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
238 +a2f58e9c1e56-0 (6, 4, 4) [complete] - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
239 +a2f58e9c1e56-2 (6, 4, 2) [complete] - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
240 e7bd5218ca15-0 (4, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
241 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
242 +3a367db1fabc-2 (5, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
243 +a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
244 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
245 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
246 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
247 The merge reuse as much of the slicing created for one of the branch |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
248 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
249 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev merge | tee merge.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
250 5f18015f9110-0 (7, 8, 8) [complete] - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
251 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
252 5f18015f9110-4 (7, 8, 4) [complete] - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
253 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
254 3a367db1fabc-1 (5, 3, 2) [complete] - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
255 5f18015f9110-6 (7, 8, 2) [complete] - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
256 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
257 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
258 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
259 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
260 3a367db1fabc-2 (5, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
261 5f18015f9110-7 (7, 8, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
262 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
263 a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
264 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
265 $ diff -u left.range merge.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
266 --- left.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
267 +++ merge.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
268 @@ -1,7 +1,15 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
269 +5f18015f9110-0 (7, 8, 8) [complete] - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
270 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
271 +5f18015f9110-4 (7, 8, 4) [complete] - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
272 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
273 +3a367db1fabc-1 (5, 3, 2) [complete] - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
274 +5f18015f9110-6 (7, 8, 2) [complete] - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
275 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
276 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
277 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
278 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
279 +3a367db1fabc-2 (5, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
280 +5f18015f9110-7 (7, 8, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
281 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
282 +a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
283 +e7bd5218ca15-1 (4, 2, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
284 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
285 $ diff -u right.range merge.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
286 --- right.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
287 +++ merge.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
288 @@ -1,7 +1,15 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
289 -a2f58e9c1e56-0 (6, 4, 4) [complete] - e7bd5218ca15-0 (4, 2, 2), a2f58e9c1e56-2 (6, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
290 -a2f58e9c1e56-2 (6, 4, 2) [complete] - 3a367db1fabc-2 (5, 3, 1), a2f58e9c1e56-3 (6, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
291 -e7bd5218ca15-0 (4, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), e7bd5218ca15-1 (4, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
292 +5f18015f9110-0 (7, 8, 8) [complete] - 2dc09a01254d-0 (3, 4, 4), 5f18015f9110-4 (7, 8, 4) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
293 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
294 +5f18015f9110-4 (7, 8, 4) [complete] - 3a367db1fabc-1 (5, 3, 2), 5f18015f9110-6 (7, 8, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
295 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
296 +3a367db1fabc-1 (5, 3, 2) [complete] - e7bd5218ca15-1 (4, 2, 1), 3a367db1fabc-2 (5, 3, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
297 +5f18015f9110-6 (7, 8, 2) [complete] - a2f58e9c1e56-3 (6, 4, 1), 5f18015f9110-7 (7, 8, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
298 +66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
299 +01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
300 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
301 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
302 3a367db1fabc-2 (5, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
303 +5f18015f9110-7 (7, 8, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
304 +66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
305 a2f58e9c1e56-3 (6, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
306 e7bd5218ca15-1 (4, 2, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
307 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
308 $ cd .. |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
309 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
310 slice create multiple heads |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
311 --------------------------- |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
312 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
313 $ hg init repo_merge_split_heads |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
314 $ cd repo_merge_split_heads |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
315 $ hg debugbuilddag '.:base |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
316 > +4:left |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
317 > <base+5:right |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
318 > <left/right:merge |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
319 > +2:head |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
320 > ' |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
321 $ hg debugbuilddag '.:base |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
322 > +3:left |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
323 > <base+3:right |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
324 > <left/right:merge |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
325 > +2:head |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
326 > ' |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
327 abort: repository is not empty |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
328 [255] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
329 $ hg log -G |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
330 o 12 e6b8d5b46647 r12 head tip |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
331 | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
332 o 11 485383494a89 r11 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
333 | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
334 o 10 8aca7f8c9bd2 r10 merge |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
335 |\ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
336 | o 9 f4b7da68b467 r9 right |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
337 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
338 | o 8 857477a9aebb r8 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
339 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
340 | o 7 42b07e8da27d r7 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
341 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
342 | o 6 b9bc20507e0b r6 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
343 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
344 | o 5 de561312eff4 r5 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
345 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
346 o | 4 bebd167eb94d r4 left |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
347 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
348 o | 3 2dc09a01254d r3 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
349 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
350 o | 2 01241442b3c2 r2 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
351 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
352 o | 1 66f7d451a68b r1 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
353 |/ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
354 o 0 1ea73414a91b r0 base |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
355 |
3236
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
356 $ hg debugdepth -r 'all()' |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
357 1ea73414a91b 1 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
358 66f7d451a68b 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
359 01241442b3c2 3 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
360 2dc09a01254d 4 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
361 bebd167eb94d 5 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
362 de561312eff4 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
363 b9bc20507e0b 3 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
364 42b07e8da27d 4 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
365 857477a9aebb 5 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
366 f4b7da68b467 6 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
367 8aca7f8c9bd2 11 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
368 485383494a89 12 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
369 e6b8d5b46647 13 |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
370 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
371 Each of the linear branch reuse range internally |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
372 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
373 (left branch) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
374 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
375 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev 'left~2' | tee left-2.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
376 01241442b3c2-0 (2, 3, 3) [complete] - 66f7d451a68b-0 (1, 2, 2), 01241442b3c2-2 (2, 3, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
377 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
378 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
379 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
380 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
381 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev left | tee left.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
382 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
383 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
384 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
385 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
386 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
387 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
388 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
389 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
390 bebd167eb94d-4 (4, 5, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
391 $ diff -u left-2.range left.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
392 --- left-2.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
393 +++ left.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
394 @@ -1,5 +1,9 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
395 -01241442b3c2-0 (2, 3, 3) [complete] - 66f7d451a68b-0 (1, 2, 2), 01241442b3c2-2 (2, 3, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
396 +bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
397 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
398 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
399 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
400 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
401 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
402 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
403 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
404 +bebd167eb94d-4 (4, 5, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
405 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
406 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
407 (right branch) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
408 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
409 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev right~2 | tee right-2.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
410 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
411 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
412 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
413 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
414 42b07e8da27d-3 (7, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
415 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
416 de561312eff4-1 (5, 2, 1) [leaf] - |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
417 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev right | tee right.range |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
418 f4b7da68b467-0 (9, 6, 6) [complete] - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
419 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
420 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
421 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
422 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
423 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
424 42b07e8da27d-3 (7, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
425 857477a9aebb-4 (8, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
426 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
427 de561312eff4-1 (5, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
428 f4b7da68b467-5 (9, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
429 $ diff -u right-2.range right.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
430 --- right-2.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
431 +++ right.range * (glob) |
2231
f872738bb5b3
stablerange: add a proper debugstablerange commands
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2230
diff
changeset
|
432 @@ -1,7 +1,11 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
433 +f4b7da68b467-0 (9, 6, 6) [complete] - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
434 42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
435 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
436 de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
437 +f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
438 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
439 42b07e8da27d-3 (7, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
440 +857477a9aebb-4 (8, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
441 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
442 de561312eff4-1 (5, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
443 +f4b7da68b467-5 (9, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
444 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
445 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
446 In this case, the bottom of the split will have multiple heads, |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
447 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
448 So we'll create more than 1 subrange out of it. |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
449 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
450 We are still able to reuse one of the branch however |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
451 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
452 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev merge | tee merge.range |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
453 8aca7f8c9bd2-0 (10, 11, 11) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-1 (7, 4, 3), 8aca7f8c9bd2-8 (10, 11, 3) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
454 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
455 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
456 42b07e8da27d-1 (7, 4, 3) [complete] - de561312eff4-1 (5, 2, 1), 42b07e8da27d-2 (7, 4, 2) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
457 8aca7f8c9bd2-8 (10, 11, 3) [complete] - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
458 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
459 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
460 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
461 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
462 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
463 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
464 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
465 42b07e8da27d-3 (7, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
466 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
467 857477a9aebb-4 (8, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
468 8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
469 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
470 bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
471 de561312eff4-1 (5, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
472 f4b7da68b467-5 (9, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
473 $ diff -u left.range merge.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
474 --- left.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
475 +++ merge.range * (glob) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
476 @@ -1,9 +1,20 @@ |
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
477 +8aca7f8c9bd2-0 (10, 11, 11) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-1 (7, 4, 3), 8aca7f8c9bd2-8 (10, 11, 3) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
478 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
479 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
480 +42b07e8da27d-1 (7, 4, 3) [complete] - de561312eff4-1 (5, 2, 1), 42b07e8da27d-2 (7, 4, 2) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
481 +8aca7f8c9bd2-8 (10, 11, 3) [complete] - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
482 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
483 +42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
484 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
485 +f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
486 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
487 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
488 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
489 +42b07e8da27d-3 (7, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
490 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
491 +857477a9aebb-4 (8, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
492 +8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
493 +b9bc20507e0b-2 (6, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
494 bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
495 +de561312eff4-1 (5, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
496 +f4b7da68b467-5 (9, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
497 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
498 $ diff -u right.range merge.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
499 --- right.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
500 +++ merge.range * (glob) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
501 @@ -1,11 +1,20 @@ |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
502 -f4b7da68b467-0 (9, 6, 6) [complete] - 42b07e8da27d-0 (7, 4, 4), f4b7da68b467-4 (9, 6, 2) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
503 -42b07e8da27d-0 (7, 4, 4) [complete] - de561312eff4-0 (5, 2, 2), 42b07e8da27d-2 (7, 4, 2) |
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
504 +8aca7f8c9bd2-0 (10, 11, 11) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-1 (7, 4, 3), 8aca7f8c9bd2-8 (10, 11, 3) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
505 +bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
506 +2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
507 +42b07e8da27d-1 (7, 4, 3) [complete] - de561312eff4-1 (5, 2, 1), 42b07e8da27d-2 (7, 4, 2) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
508 +8aca7f8c9bd2-8 (10, 11, 3) [complete] - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
509 +2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
510 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
511 -de561312eff4-0 (5, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), de561312eff4-1 (5, 2, 1) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
512 +66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
513 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
514 +01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
515 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
516 +2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
517 42b07e8da27d-3 (7, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
518 +66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
519 857477a9aebb-4 (8, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
520 +8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
521 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
522 +bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
523 de561312eff4-1 (5, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
524 f4b7da68b467-5 (9, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
525 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
526 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
527 Range above the merge, reuse subrange from the merge |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
528 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
529 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev tip | tee tip.range |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
530 e6b8d5b46647-0 (12, 13, 13) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-1 (7, 4, 3), e6b8d5b46647-8 (12, 13, 5) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
531 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
532 e6b8d5b46647-8 (12, 13, 5) [complete] - 485383494a89-8 (11, 12, 4), e6b8d5b46647-12 (12, 13, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
533 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
534 485383494a89-8 (11, 12, 4) [complete] - f4b7da68b467-4 (9, 6, 2), 485383494a89-10 (11, 12, 2) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
535 42b07e8da27d-1 (7, 4, 3) [complete] - de561312eff4-1 (5, 2, 1), 42b07e8da27d-2 (7, 4, 2) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
536 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
537 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
538 485383494a89-10 (11, 12, 2) [complete] - 8aca7f8c9bd2-10 (10, 11, 1), 485383494a89-11 (11, 12, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
539 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
540 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
541 01241442b3c2-2 (2, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
542 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
543 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
544 42b07e8da27d-3 (7, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
545 485383494a89-11 (11, 12, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
546 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
547 857477a9aebb-4 (8, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
548 8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
549 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
550 bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
551 de561312eff4-1 (5, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
552 e6b8d5b46647-12 (12, 13, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
553 f4b7da68b467-5 (9, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
554 $ diff -u merge.range tip.range |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
555 --- merge.range * (glob) |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
556 +++ tip.range * (glob) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
557 @@ -1,20 +1,24 @@ |
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
558 -8aca7f8c9bd2-0 (10, 11, 11) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-1 (7, 4, 3), 8aca7f8c9bd2-8 (10, 11, 3) |
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
559 +e6b8d5b46647-0 (12, 13, 13) [complete] - bebd167eb94d-0 (4, 5, 5), 42b07e8da27d-1 (7, 4, 3), e6b8d5b46647-8 (12, 13, 5) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
560 bebd167eb94d-0 (4, 5, 5) [complete] - 2dc09a01254d-0 (3, 4, 4), bebd167eb94d-4 (4, 5, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
561 +e6b8d5b46647-8 (12, 13, 5) [complete] - 485383494a89-8 (11, 12, 4), e6b8d5b46647-12 (12, 13, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
562 2dc09a01254d-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2dc09a01254d-2 (3, 4, 2) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
563 +485383494a89-8 (11, 12, 4) [complete] - f4b7da68b467-4 (9, 6, 2), 485383494a89-10 (11, 12, 2) |
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
564 42b07e8da27d-1 (7, 4, 3) [complete] - de561312eff4-1 (5, 2, 1), 42b07e8da27d-2 (7, 4, 2) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
565 -8aca7f8c9bd2-8 (10, 11, 3) [complete] - f4b7da68b467-4 (9, 6, 2), 8aca7f8c9bd2-10 (10, 11, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
566 2dc09a01254d-2 (3, 4, 2) [complete] - 01241442b3c2-2 (2, 3, 1), 2dc09a01254d-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
567 42b07e8da27d-2 (7, 4, 2) [complete] - b9bc20507e0b-2 (6, 3, 1), 42b07e8da27d-3 (7, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
568 +485383494a89-10 (11, 12, 2) [complete] - 8aca7f8c9bd2-10 (10, 11, 1), 485383494a89-11 (11, 12, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
569 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
570 f4b7da68b467-4 (9, 6, 2) [complete] - 857477a9aebb-4 (8, 5, 1), f4b7da68b467-5 (9, 6, 1) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
571 01241442b3c2-2 (2, 3, 1) [leaf] - |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
572 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
573 2dc09a01254d-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
574 42b07e8da27d-3 (7, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
575 +485383494a89-11 (11, 12, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
576 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
577 857477a9aebb-4 (8, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
578 8aca7f8c9bd2-10 (10, 11, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
579 b9bc20507e0b-2 (6, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
580 bebd167eb94d-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
581 de561312eff4-1 (5, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
582 +e6b8d5b46647-12 (12, 13, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
583 f4b7da68b467-5 (9, 6, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
584 [1] |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
585 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
586 $ cd .. |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
587 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
588 Tests range with criss cross merge in the graph |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
589 =============================================== |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
590 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
591 $ hg init repo_criss_cross |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
592 $ cd repo_criss_cross |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
593 $ hg debugbuilddag ' |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
594 > ..:g # 2 nodes, tagged "g" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
595 > <2.:h # another node base one -2 -> 0, tagged "h" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
596 > *1/2:m # merge -1 and -2 (1, 2), tagged "m" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
597 > <2+2:i # 2 nodes based on -2, tag head as "i" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
598 > .:c # 1 node tagged "c" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
599 > <m+3:a # 3 nodes base on the "m" tag |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
600 > <2.:b # 1 node based on -2; tagged "b" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
601 > <m+2:d # 2 nodes from "m" tagged "d" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
602 > <2.:e # 1 node based on -2, tagged "e" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
603 > <m+1:f # 1 node based on "m" tagged "f" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
604 > <i/f # merge "i" and "f" |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
605 > ' |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
606 $ hg log -G |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
607 o 15 1d8d22637c2d r15 tip |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
608 |\ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
609 | o 14 43227190fef8 r14 f |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
610 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
611 | | o 13 b4594d867745 r13 e |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
612 | | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
613 | | | o 12 e46a4836065c r12 d |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
614 | | |/ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
615 | | o 11 bab5d5bf48bd r11 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
616 | |/ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
617 | | o 10 ff43616e5d0f r10 b |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
618 | | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
619 | | | o 9 dcbb326fdec2 r9 a |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
620 | | |/ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
621 | | o 8 d62d843c9a01 r8 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
622 | | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
623 | | o 7 e7d9710d9fc6 r7 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
624 | |/ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
625 +---o 6 2702dd0c91e7 r6 c |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
626 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
627 o | 5 f0f3ef9a6cd5 r5 i |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
628 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
629 o | 4 4c748ffd1a46 r4 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
630 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
631 | o 3 2b6d669947cd r3 m |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
632 |/| |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
633 o | 2 fa942426a6fd r2 h |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
634 | | |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
635 | o 1 66f7d451a68b r1 g |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
636 |/ |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
637 o 0 1ea73414a91b r0 |
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
638 |
3236
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
639 $ hg debugdepth -r 'all()' |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
640 1ea73414a91b 1 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
641 66f7d451a68b 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
642 fa942426a6fd 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
643 2b6d669947cd 4 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
644 4c748ffd1a46 3 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
645 f0f3ef9a6cd5 4 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
646 2702dd0c91e7 5 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
647 e7d9710d9fc6 5 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
648 d62d843c9a01 6 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
649 dcbb326fdec2 7 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
650 ff43616e5d0f 7 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
651 bab5d5bf48bd 5 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
652 e46a4836065c 6 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
653 b4594d867745 6 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
654 43227190fef8 5 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
655 1d8d22637c2d 8 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
656 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev 'head()' |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
657 1d8d22637c2d-0 (15, 8, 8) [complete] - 2b6d669947cd-0 (3, 4, 4), 1d8d22637c2d-4 (15, 8, 4) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
658 dcbb326fdec2-0 (9, 7, 7) [complete] - 2b6d669947cd-0 (3, 4, 4), dcbb326fdec2-4 (9, 7, 3) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
659 ff43616e5d0f-0 (10, 7, 7) [complete] - 2b6d669947cd-0 (3, 4, 4), ff43616e5d0f-4 (10, 7, 3) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
660 b4594d867745-0 (13, 6, 6) [complete] - 2b6d669947cd-0 (3, 4, 4), b4594d867745-4 (13, 6, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
661 e46a4836065c-0 (12, 6, 6) [complete] - 2b6d669947cd-0 (3, 4, 4), e46a4836065c-4 (12, 6, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
662 2702dd0c91e7-0 (6, 5, 5) [complete] - f0f3ef9a6cd5-0 (5, 4, 4), 2702dd0c91e7-4 (6, 5, 1) |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
663 1d8d22637c2d-4 (15, 8, 4) [complete] - 43227190fef8-4 (14, 5, 1), 4c748ffd1a46-2 (4, 3, 1), 1d8d22637c2d-6 (15, 8, 2) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
664 2b6d669947cd-0 (3, 4, 4) [complete] - 66f7d451a68b-0 (1, 2, 2), 2b6d669947cd-2 (3, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
665 f0f3ef9a6cd5-0 (5, 4, 4) [complete] - fa942426a6fd-0 (2, 2, 2), f0f3ef9a6cd5-2 (5, 4, 2) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
666 dcbb326fdec2-4 (9, 7, 3) [complete] - d62d843c9a01-4 (8, 6, 2), dcbb326fdec2-6 (9, 7, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
667 ff43616e5d0f-4 (10, 7, 3) [complete] - d62d843c9a01-4 (8, 6, 2), ff43616e5d0f-6 (10, 7, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
668 1d8d22637c2d-6 (15, 8, 2) [complete] - f0f3ef9a6cd5-3 (5, 4, 1), 1d8d22637c2d-7 (15, 8, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
669 2b6d669947cd-2 (3, 4, 2) [complete] - fa942426a6fd-1 (2, 2, 1), 2b6d669947cd-3 (3, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
670 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
671 b4594d867745-4 (13, 6, 2) [complete] - bab5d5bf48bd-4 (11, 5, 1), b4594d867745-5 (13, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
672 d62d843c9a01-4 (8, 6, 2) [complete] - e7d9710d9fc6-4 (7, 5, 1), d62d843c9a01-5 (8, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
673 e46a4836065c-4 (12, 6, 2) [complete] - bab5d5bf48bd-4 (11, 5, 1), e46a4836065c-5 (12, 6, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
674 f0f3ef9a6cd5-2 (5, 4, 2) [complete] - 4c748ffd1a46-2 (4, 3, 1), f0f3ef9a6cd5-3 (5, 4, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
675 fa942426a6fd-0 (2, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), fa942426a6fd-1 (2, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
676 1d8d22637c2d-7 (15, 8, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
677 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
678 2702dd0c91e7-4 (6, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
679 2b6d669947cd-3 (3, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
680 43227190fef8-4 (14, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
681 4c748ffd1a46-2 (4, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
682 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
683 b4594d867745-5 (13, 6, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
684 bab5d5bf48bd-4 (11, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
685 d62d843c9a01-5 (8, 6, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
686 dcbb326fdec2-6 (9, 7, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
687 e46a4836065c-5 (12, 6, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
688 e7d9710d9fc6-4 (7, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
689 f0f3ef9a6cd5-3 (5, 4, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
690 fa942426a6fd-1 (2, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
691 ff43616e5d0f-6 (10, 7, 1) [leaf] - |
2082
3f787182509f
discovery: introduce "stable slicing" methods
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
692 $ cd .. |
2207
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
693 |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
694 Tests range where a toprange is rooted on a merge |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
695 ================================================= |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
696 |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
697 $ hg init slice_on_merge |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
698 $ cd slice_on_merge |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
699 $ hg debugbuilddag ' |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
700 > ..:a # 2 nodes, tagged "a" |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
701 > <2..:b # another branch with two node based on 0, tagged b |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
702 > *a/b:m # merge -1 and -2 (1, 2), tagged "m" |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
703 > ' |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
704 $ hg log -G |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
705 o 4 f37e476fba9a r4 m tip |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
706 |\ |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
707 | o 3 36315563e2fa r3 b |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
708 | | |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
709 | o 2 fa942426a6fd r2 |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
710 | | |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
711 o | 1 66f7d451a68b r1 a |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
712 |/ |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
713 o 0 1ea73414a91b r0 |
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
714 |
3236
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
715 $ hg debugdepth -r 'all()' |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
716 1ea73414a91b 1 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
717 66f7d451a68b 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
718 fa942426a6fd 2 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
719 36315563e2fa 3 |
7c78b0c482a1
depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2232
diff
changeset
|
720 f37e476fba9a 5 |
6482
530c7eaa9d57
stable-range: rename `debugstablerange` into `debug::evo-ext-stable-range`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
5992
diff
changeset
|
721 $ hg debug::evo-ext-stable-range --verify --verbose --subranges --rev 'head()' |
3252
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
722 f37e476fba9a-0 (4, 5, 5) [complete] - 66f7d451a68b-0 (1, 2, 2), 36315563e2fa-1 (3, 3, 2), f37e476fba9a-4 (4, 5, 1) |
d57400a0f4c3
stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3249
diff
changeset
|
723 36315563e2fa-1 (3, 3, 2) [complete] - fa942426a6fd-1 (2, 2, 1), 36315563e2fa-2 (3, 3, 1) |
2232
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
724 66f7d451a68b-0 (1, 2, 2) [complete] - 1ea73414a91b-0 (0, 1, 1), 66f7d451a68b-1 (1, 2, 1) |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
725 1ea73414a91b-0 (0, 1, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
726 36315563e2fa-2 (3, 3, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
727 66f7d451a68b-1 (1, 2, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
728 f37e476fba9a-4 (4, 5, 1) [leaf] - |
6b95bcc402fe
debugstablerange: add a --verify flag to the command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2231
diff
changeset
|
729 fa942426a6fd-1 (2, 2, 1) [leaf] - |
2207
f82a398162f5
stablerange: fix a bug when a top slice ended on a merge
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2083
diff
changeset
|
730 |