author | Martin von Zweigbergk <martinvonz@google.com> |
Fri, 19 May 2017 11:50:01 -0700 | |
changeset 32553 | 20c9f3ecc192 |
parent 32491 | f2116efd2c3a |
child 32597 | 9df4c2613fca |
permissions | -rw-r--r-- |
32487
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 |
================================================== |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 |
Test obsmarkers interaction with bundle and strip |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 |
================================================== |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 |
In practice, this file does not yet contains any tests for bundle and strip. |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 |
But their will be some soon (tm). |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 |
For now this test check the logic computing markers relevant to a set of |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 |
revision. That logic will be use by "hg bundle" to select the markers to |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 |
include, and strip to find the markers to backup. |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 |
Setup a repository with various case |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 |
==================================== |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 |
Config setup |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 |
------------ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 |
$ cat >> $HGRCPATH <<EOF |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 |
> [ui] |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 |
> # simpler log output |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 |
> logtemplate = "{node|short}: {desc}\n" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 |
> |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 |
> [experimental] |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 |
> # enable evolution |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
25 |
> evolution = all |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 |
> |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 |
> # include obsmarkers in bundle |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
28 |
> evolution.bundle-obsmarker = yes |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
29 |
> |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
30 |
> [extensions] |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
31 |
> # needed for some tests |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
32 |
> strip = |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
33 |
> [defaults] |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
34 |
> # we'll query many hidden changeset |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
35 |
> debugobsolete = --hidden |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
36 |
> EOF |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 |
$ mkcommit() { |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
39 |
> echo "$1" > "$1" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
40 |
> hg add "$1" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
41 |
> hg ci -m "$1" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 |
> } |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
43 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
44 |
$ getid() { |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
45 |
> hg log --hidden --template '{node}\n' --rev "$1" |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 |
> } |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
47 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 |
$ mktestrepo () { |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
49 |
> [ -n "$1" ] || exit 1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
50 |
> cd $TESTTMP |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
51 |
> hg init $1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
52 |
> cd $1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
53 |
> mkcommit ROOT |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
54 |
> } |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
55 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
56 |
root setup |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
57 |
------------- |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
58 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
59 |
simple chain |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
60 |
============ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
61 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
62 |
. A0 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
63 |
. ⇠ø⇠◔ A1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
64 |
. |/ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
65 |
. ● |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
66 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
67 |
setup |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
68 |
----- |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
69 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
70 |
$ mktestrepo simple-chain |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
71 |
$ mkcommit 'C-A0' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
72 |
$ hg up 'desc("ROOT")' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
73 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
74 |
$ mkcommit 'C-A1' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
75 |
created new head |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
76 |
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 |
$ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
78 |
$ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
79 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
80 |
$ hg up 'desc("ROOT")' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
81 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
82 |
$ hg log --hidden -G |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
83 |
o cf2c22470d67: C-A1 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
84 |
| |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
85 |
| x 84fcb0dfe17b: C-A0 |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
86 |
|/ |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
87 |
@ ea207398892e: ROOT |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
88 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
89 |
$ hg debugobsolete |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
90 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
91 |
84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
92 |
a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
93 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
94 |
Actual testing |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
95 |
-------------- |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
96 |
|
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
97 |
$ hg debugobsolete --rev 'desc("C-A0")' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
98 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
99 |
$ hg debugobsolete --rev 'desc("C-A1")' |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
100 |
84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
101 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f475446b4837
test: add a test file for relevant obsmarkers and its usage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
102 |
a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32488
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
103 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
104 |
chain with prune children |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
105 |
========================= |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
106 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
107 |
. ⇠⊗ B0 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
108 |
. | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
109 |
. ⇠ø⇠◔ A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
110 |
. | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
111 |
. ● |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
112 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
113 |
setup |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
114 |
----- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
115 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
116 |
$ mktestrepo prune |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
117 |
$ mkcommit 'C-A0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
118 |
$ mkcommit 'C-B0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
119 |
$ hg up 'desc("ROOT")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
120 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
121 |
$ mkcommit 'C-A1' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
122 |
created new head |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
123 |
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
124 |
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
125 |
$ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
126 |
$ hg up 'desc("ROOT")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
127 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
128 |
$ hg log --hidden -G |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
129 |
o cf2c22470d67: C-A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
130 |
| |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
131 |
| x 29f93b1df87b: C-B0 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
132 |
| | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
133 |
| x 84fcb0dfe17b: C-A0 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
134 |
|/ |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
135 |
@ ea207398892e: ROOT |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
136 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
137 |
$ hg debugobsolete |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
138 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
139 |
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
140 |
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
141 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
142 |
Actual testing |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
143 |
-------------- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
144 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
145 |
$ hg debugobsolete --rev 'desc("C-A0")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
146 |
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
147 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
148 |
$ hg debugobsolete --rev 'desc("C-B0")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
149 |
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
150 |
$ hg debugobsolete --rev 'desc("C-A1")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
151 |
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
152 |
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
153 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
154 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
155 |
chain with precursors also pruned |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
156 |
================================= |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
157 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
158 |
. A0 (also pruned) |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
159 |
. ⇠ø⇠◔ A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
160 |
. | |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
161 |
. ● |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
162 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
163 |
setup |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
164 |
----- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
165 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
166 |
$ mktestrepo prune-inline |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
167 |
$ mkcommit 'C-A0' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
168 |
$ hg up 'desc("ROOT")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
169 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
170 |
$ mkcommit 'C-A1' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
171 |
created new head |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
172 |
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
173 |
$ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
174 |
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
175 |
$ hg up 'desc("ROOT")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
176 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
177 |
$ hg log --hidden -G |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
178 |
o cf2c22470d67: C-A1 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
179 |
| |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
180 |
| x 84fcb0dfe17b: C-A0 |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
181 |
|/ |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
182 |
@ ea207398892e: ROOT |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
183 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
184 |
$ hg debugobsolete |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
185 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
186 |
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
187 |
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
188 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
189 |
Actual testing |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
190 |
-------------- |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
191 |
|
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
192 |
$ hg debugobsolete --rev 'desc("C-A0")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
193 |
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
194 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
195 |
$ hg debugobsolete --rev 'desc("C-A1")' |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
196 |
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
197 |
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
176d1a0ce385
obsolete: fix relevant-obsmarkers computation on pruned changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32487
diff
changeset
|
198 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32489
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
199 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
200 |
chain with missing prune |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
201 |
======================== |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
202 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
203 |
. ⊗ B |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
204 |
. | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
205 |
. ⇠◌⇠◔ A1 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
206 |
. | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
207 |
. ● |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
208 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
209 |
setup |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
210 |
----- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
211 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
212 |
$ mktestrepo missing-prune |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
213 |
$ mkcommit 'C-A0' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
214 |
$ mkcommit 'C-B0' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
215 |
$ hg up 'desc("ROOT")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
216 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
217 |
$ mkcommit 'C-A1' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
218 |
created new head |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
219 |
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
220 |
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
221 |
$ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
222 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
223 |
(it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
224 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
225 |
$ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
226 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
227 |
$ hg up 'desc("ROOT")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
228 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
229 |
$ hg log --hidden -G |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
230 |
o cf2c22470d67: C-A1 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
231 |
| |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
232 |
@ ea207398892e: ROOT |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
233 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
234 |
$ hg debugobsolete |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
235 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
236 |
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
237 |
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
238 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
239 |
Actual testing |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
240 |
-------------- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
241 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
242 |
$ hg debugobsolete --rev 'desc("C-A1")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
243 |
29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
244 |
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
245 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
246 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
247 |
chain with precursors also pruned |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
248 |
================================= |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
249 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
250 |
. A0 (also pruned) |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
251 |
. ⇠◌⇠◔ A1 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
252 |
. | |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
253 |
. ● |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
254 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
255 |
setup |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
256 |
----- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
257 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
258 |
$ mktestrepo prune-inline-missing |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
259 |
$ mkcommit 'C-A0' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
260 |
$ hg up 'desc("ROOT")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
261 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
262 |
$ mkcommit 'C-A1' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
263 |
created new head |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
264 |
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
265 |
$ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
266 |
$ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
267 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
268 |
(it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
269 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
270 |
$ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
271 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
272 |
$ hg up 'desc("ROOT")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
273 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
274 |
$ hg log --hidden -G |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
275 |
o cf2c22470d67: C-A1 |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
276 |
| |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
277 |
@ ea207398892e: ROOT |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
278 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
279 |
$ hg debugobsolete |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
280 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
281 |
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
282 |
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
283 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
284 |
Actual testing |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
285 |
-------------- |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
286 |
|
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
287 |
$ hg debugobsolete --rev 'desc("C-A1")' |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
288 |
84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
289 |
84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
248f68c482f2
test-obsolete-bundle-strip: add cases with prune on missing revs
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32488
diff
changeset
|
290 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32490
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
291 |
|
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
292 |
Chain with fold and split |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
293 |
========================= |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
294 |
|
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
295 |
setup |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
296 |
----- |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
297 |
|
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
298 |
$ mktestrepo split-fold |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
299 |
$ mkcommit 'C-A' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
300 |
$ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
301 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
302 |
$ mkcommit 'C-B' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
303 |
created new head |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
304 |
$ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
305 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
306 |
$ mkcommit 'C-C' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
307 |
created new head |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
308 |
$ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
309 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
310 |
$ mkcommit 'C-D' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
311 |
created new head |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
312 |
$ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
313 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
314 |
$ mkcommit 'C-E' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
315 |
created new head |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
316 |
$ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
317 |
$ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
318 |
$ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
319 |
$ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
320 |
$ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
321 |
$ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
322 |
$ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
323 |
$ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
324 |
$ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
325 |
|
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
326 |
$ hg up 'desc("ROOT")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
327 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
328 |
$ hg log --hidden -G |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
329 |
o 2f20ff6509f0: C-E |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
330 |
| |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
331 |
| x 06dc9da25ef0: C-D |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
332 |
|/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
333 |
| x 27ec657ca21d: C-C |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
334 |
|/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
335 |
| x a9b9da38ed96: C-B |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
336 |
|/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
337 |
| x 9ac430e15fca: C-A |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
338 |
|/ |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
339 |
@ ea207398892e: ROOT |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
340 |
|
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
341 |
$ hg debugobsolete |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
342 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
343 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
344 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
345 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
346 |
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
347 |
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
348 |
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
349 |
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
350 |
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
351 |
|
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
352 |
Actual testing |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
353 |
-------------- |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
354 |
|
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
355 |
$ hg debugobsolete --rev 'desc("C-A")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
356 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
357 |
$ hg debugobsolete --rev 'desc("C-B")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
358 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
359 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
360 |
$ hg debugobsolete --rev 'desc("C-C")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
361 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
362 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
363 |
$ hg debugobsolete --rev 'desc("C-D")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
364 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
365 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
366 |
$ hg debugobsolete --rev 'desc("C-E")' |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
367 |
06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
368 |
27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
369 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
370 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
371 |
9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
372 |
a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
373 |
a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
374 |
b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
b1dcb174f948
test-obsolete-bundle-strip: add a complex split and fold case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32489
diff
changeset
|
375 |
c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
32491
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
376 |
|
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
377 |
changeset pruned on its own |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
378 |
=========================== |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
379 |
|
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
380 |
. ⊗ B |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
381 |
. | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
382 |
. ◕ A |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
383 |
. | |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
384 |
. ● |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
385 |
|
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
386 |
setup |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
387 |
----- |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
388 |
|
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
389 |
$ mktestrepo lonely-prune |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
390 |
$ hg up 'desc("ROOT")' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
391 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
392 |
$ mkcommit 'C-A' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
393 |
$ mkcommit 'C-B' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
394 |
$ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
395 |
|
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
396 |
$ hg up 'desc("ROOT")' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
397 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
398 |
$ hg log --hidden -G |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
399 |
x cefb651fc2fd: C-B |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
400 |
| |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
401 |
o 9ac430e15fca: C-A |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
402 |
| |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
403 |
@ ea207398892e: ROOT |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
404 |
|
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
405 |
$ hg debugobsolete |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
406 |
cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
407 |
|
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
408 |
Actual testing |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
409 |
-------------- |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
410 |
$ hg debugobsolete --rev 'desc("C-A")' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
411 |
cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
412 |
$ hg debugobsolete --hidden --rev 'desc("C-B")' |
f2116efd2c3a
test: add isolated prune case (to test-obsolete-bundle-strip.t)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
32490
diff
changeset
|
413 |
cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |