Show More
@@ -1,534 +1,570 b'' | |||||
1 | ================================================== |
|
1 | ================================================== | |
2 | Test obsmarkers interaction with bundle and strip |
|
2 | Test obsmarkers interaction with bundle and strip | |
3 | ================================================== |
|
3 | ================================================== | |
4 |
|
4 | |||
5 | The file currently only contains test for bundle. |
|
5 | The file currently only contains test for bundle. | |
6 | Testing of strip will happen some time soon (tm). |
|
6 | Testing of strip will happen some time soon (tm). | |
7 |
|
7 | |||
8 | Setup a repository with various case |
|
8 | Setup a repository with various case | |
9 | ==================================== |
|
9 | ==================================== | |
10 |
|
10 | |||
11 | Config setup |
|
11 | Config setup | |
12 | ------------ |
|
12 | ------------ | |
13 |
|
13 | |||
14 | $ cat >> $HGRCPATH <<EOF |
|
14 | $ cat >> $HGRCPATH <<EOF | |
15 | > [ui] |
|
15 | > [ui] | |
16 | > # simpler log output |
|
16 | > # simpler log output | |
17 | > logtemplate = "{node|short}: {desc}\n" |
|
17 | > logtemplate = "{node|short}: {desc}\n" | |
18 | > |
|
18 | > | |
19 | > [experimental] |
|
19 | > [experimental] | |
20 | > # enable evolution |
|
20 | > # enable evolution | |
21 | > evolution = all |
|
21 | > evolution = all | |
22 | > |
|
22 | > | |
23 | > # include obsmarkers in bundle |
|
23 | > # include obsmarkers in bundle | |
24 | > evolution.bundle-obsmarker = yes |
|
24 | > evolution.bundle-obsmarker = yes | |
25 | > |
|
25 | > | |
26 | > [extensions] |
|
26 | > [extensions] | |
27 | > # needed for some tests |
|
27 | > # needed for some tests | |
28 | > strip = |
|
28 | > strip = | |
29 | > [defaults] |
|
29 | > [defaults] | |
30 | > # we'll query many hidden changeset |
|
30 | > # we'll query many hidden changeset | |
31 | > debugobsolete = --hidden |
|
31 | > debugobsolete = --hidden | |
32 | > EOF |
|
32 | > EOF | |
33 |
|
33 | |||
34 | $ mkcommit() { |
|
34 | $ mkcommit() { | |
35 | > echo "$1" > "$1" |
|
35 | > echo "$1" > "$1" | |
36 | > hg add "$1" |
|
36 | > hg add "$1" | |
37 | > hg ci -m "$1" |
|
37 | > hg ci -m "$1" | |
38 | > } |
|
38 | > } | |
39 |
|
39 | |||
40 | $ getid() { |
|
40 | $ getid() { | |
41 | > hg log --hidden --template '{node}\n' --rev "$1" |
|
41 | > hg log --hidden --template '{node}\n' --rev "$1" | |
42 | > } |
|
42 | > } | |
43 |
|
43 | |||
44 | $ mktestrepo () { |
|
44 | $ mktestrepo () { | |
45 | > [ -n "$1" ] || exit 1 |
|
45 | > [ -n "$1" ] || exit 1 | |
46 | > cd $TESTTMP |
|
46 | > cd $TESTTMP | |
47 | > hg init $1 |
|
47 | > hg init $1 | |
48 | > cd $1 |
|
48 | > cd $1 | |
49 | > mkcommit ROOT |
|
49 | > mkcommit ROOT | |
50 | > } |
|
50 | > } | |
51 |
|
51 | |||
52 | Function to compare the expected bundled obsmarkers with the actually bundled |
|
52 | Function to compare the expected bundled obsmarkers with the actually bundled | |
53 | obsmarkers. |
|
53 | obsmarkers. | |
54 |
|
54 | |||
55 | $ testrevs () { |
|
55 | $ testrevs () { | |
56 | > revs="$1" |
|
56 | > revs="$1" | |
57 | > testname=`basename \`pwd\`` |
|
57 | > testname=`basename \`pwd\`` | |
58 | > revsname=`hg --hidden log -T '-{desc}\n' --rev "${revs}"` |
|
58 | > revsname=`hg --hidden log -T '-{desc}\n' --rev "${revs}"` | |
59 | > prefix="${TESTTMP}/${testname}${revsname}" |
|
59 | > prefix="${TESTTMP}/${testname}${revsname}" | |
60 | > markersfile="${prefix}-relevant-markers.txt" |
|
60 | > markersfile="${prefix}-relevant-markers.txt" | |
61 | > bundlefile="${prefix}-bundle.hg" |
|
61 | > bundlefile="${prefix}-bundle.hg" | |
62 | > contentfile="${prefix}-bundle-markers.hg" |
|
62 | > contentfile="${prefix}-bundle-markers.hg" | |
63 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" |
|
63 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" | |
64 | > echo '### Matched revisions###' |
|
64 | > echo '### Matched revisions###' | |
65 | > hg log --hidden --rev "${revs}" | sort |
|
65 | > hg log --hidden --rev "${revs}" | sort | |
66 | > echo '### Relevant markers ###' |
|
66 | > echo '### Relevant markers ###' | |
67 | > cat "${markersfile}" |
|
67 | > cat "${markersfile}" | |
68 | > printf "# bundling: " |
|
68 | > printf "# bundling: " | |
69 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" |
|
69 | > hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}" | |
70 | > hg debugbundle "${bundlefile}" | grep "obsmarkers --" -A 100 | sed 1,2d > "${contentfile}" |
|
70 | > hg debugbundle "${bundlefile}" | grep "obsmarkers --" -A 100 | sed 1,2d > "${contentfile}" | |
71 | > echo '### Bundled markers ###' |
|
71 | > echo '### Bundled markers ###' | |
72 | > cat "${contentfile}" |
|
72 | > cat "${contentfile}" | |
73 | > echo '### diff <relevant> <bundled> ###' |
|
73 | > echo '### diff <relevant> <bundled> ###' | |
74 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" |
|
74 | > cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}" | |
75 | > echo '#################################' |
|
75 | > echo '#################################' | |
76 | > } |
|
76 | > } | |
77 |
|
77 | |||
78 | root setup |
|
78 | root setup | |
79 | ------------- |
|
79 | ------------- | |
80 |
|
80 | |||
81 | simple chain |
|
81 | simple chain | |
82 | ============ |
|
82 | ============ | |
83 |
|
83 | |||
84 | . A0 |
|
84 | . A0 | |
85 | . ⇠ø⇠◔ A1 |
|
85 | . ⇠ø⇠◔ A1 | |
86 | . |/ |
|
86 | . |/ | |
87 | . ● |
|
87 | . ● | |
88 |
|
88 | |||
89 | setup |
|
89 | setup | |
90 | ----- |
|
90 | ----- | |
91 |
|
91 | |||
92 | $ mktestrepo simple-chain |
|
92 | $ mktestrepo simple-chain | |
93 | $ mkcommit 'C-A0' |
|
93 | $ mkcommit 'C-A0' | |
94 | $ hg up 'desc("ROOT")' |
|
94 | $ hg up 'desc("ROOT")' | |
95 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
95 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
96 | $ mkcommit 'C-A1' |
|
96 | $ mkcommit 'C-A1' | |
97 | created new head |
|
97 | created new head | |
98 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
98 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
99 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
|
99 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 | |
100 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
|
100 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` | |
101 |
|
101 | |||
102 | $ hg up 'desc("ROOT")' |
|
102 | $ hg up 'desc("ROOT")' | |
103 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
103 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
104 | $ hg log --hidden -G |
|
104 | $ hg log --hidden -G | |
105 | o cf2c22470d67: C-A1 |
|
105 | o cf2c22470d67: C-A1 | |
106 | | |
|
106 | | | |
107 | | x 84fcb0dfe17b: C-A0 |
|
107 | | x 84fcb0dfe17b: C-A0 | |
108 | |/ |
|
108 | |/ | |
109 | @ ea207398892e: ROOT |
|
109 | @ ea207398892e: ROOT | |
110 |
|
110 | |||
111 | $ hg debugobsolete |
|
111 | $ hg debugobsolete | |
112 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
112 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
113 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
113 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
114 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
114 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
115 |
|
115 | |||
116 | Actual testing |
|
116 | Actual testing | |
117 | -------------- |
|
117 | -------------- | |
118 |
|
118 | |||
119 | $ testrevs 'desc("C-A0")' |
|
119 | $ testrevs 'desc("C-A0")' | |
120 | ### Matched revisions### |
|
120 | ### Matched revisions### | |
121 | 84fcb0dfe17b: C-A0 |
|
121 | 84fcb0dfe17b: C-A0 | |
122 | ### Relevant markers ### |
|
122 | ### Relevant markers ### | |
123 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
123 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
124 | # bundling: 1 changesets found |
|
124 | # bundling: 1 changesets found | |
125 | ### Bundled markers ### |
|
125 | ### Bundled markers ### | |
126 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
126 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
127 | ### diff <relevant> <bundled> ### |
|
127 | ### diff <relevant> <bundled> ### | |
128 | ################################# |
|
128 | ################################# | |
129 |
|
129 | |||
130 | $ testrevs 'desc("C-A1")' |
|
130 | $ testrevs 'desc("C-A1")' | |
131 | ### Matched revisions### |
|
131 | ### Matched revisions### | |
132 | cf2c22470d67: C-A1 |
|
132 | cf2c22470d67: C-A1 | |
133 | ### Relevant markers ### |
|
133 | ### Relevant markers ### | |
134 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
134 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
135 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
135 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
136 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
136 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
137 | # bundling: 1 changesets found |
|
137 | # bundling: 1 changesets found | |
138 | ### Bundled markers ### |
|
138 | ### Bundled markers ### | |
139 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
139 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
140 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
141 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
141 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
142 | ### diff <relevant> <bundled> ### |
|
142 | ### diff <relevant> <bundled> ### | |
143 | ################################# |
|
143 | ################################# | |
144 |
|
144 | |||
145 | $ testrevs 'desc("C-A")' |
|
145 | $ testrevs 'desc("C-A")' | |
146 | ### Matched revisions### |
|
146 | ### Matched revisions### | |
147 | 84fcb0dfe17b: C-A0 |
|
147 | 84fcb0dfe17b: C-A0 | |
148 | cf2c22470d67: C-A1 |
|
148 | cf2c22470d67: C-A1 | |
149 | ### Relevant markers ### |
|
149 | ### Relevant markers ### | |
150 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
150 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
151 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
151 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
152 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
152 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
153 | # bundling: 2 changesets found |
|
153 | # bundling: 2 changesets found | |
154 | ### Bundled markers ### |
|
154 | ### Bundled markers ### | |
155 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
155 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
156 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
156 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
157 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
157 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
158 | ### diff <relevant> <bundled> ### |
|
158 | ### diff <relevant> <bundled> ### | |
159 | ################################# |
|
159 | ################################# | |
160 |
|
160 | |||
161 | chain with prune children |
|
161 | chain with prune children | |
162 | ========================= |
|
162 | ========================= | |
163 |
|
163 | |||
164 | . ⇠⊗ B0 |
|
164 | . ⇠⊗ B0 | |
165 | . | |
|
165 | . | | |
166 | . ⇠ø⇠◔ A1 |
|
166 | . ⇠ø⇠◔ A1 | |
167 | . | |
|
167 | . | | |
168 | . ● |
|
168 | . ● | |
169 |
|
169 | |||
170 | setup |
|
170 | setup | |
171 | ----- |
|
171 | ----- | |
172 |
|
172 | |||
173 | $ mktestrepo prune |
|
173 | $ mktestrepo prune | |
174 | $ mkcommit 'C-A0' |
|
174 | $ mkcommit 'C-A0' | |
175 | $ mkcommit 'C-B0' |
|
175 | $ mkcommit 'C-B0' | |
176 | $ hg up 'desc("ROOT")' |
|
176 | $ hg up 'desc("ROOT")' | |
177 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
177 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
178 | $ mkcommit 'C-A1' |
|
178 | $ mkcommit 'C-A1' | |
179 | created new head |
|
179 | created new head | |
180 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
180 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
181 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
181 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
182 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
182 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
183 | $ hg up 'desc("ROOT")' |
|
183 | $ hg up 'desc("ROOT")' | |
184 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
184 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
185 | $ hg log --hidden -G |
|
185 | $ hg log --hidden -G | |
186 | o cf2c22470d67: C-A1 |
|
186 | o cf2c22470d67: C-A1 | |
187 | | |
|
187 | | | |
188 | | x 29f93b1df87b: C-B0 |
|
188 | | x 29f93b1df87b: C-B0 | |
189 | | | |
|
189 | | | | |
190 | | x 84fcb0dfe17b: C-A0 |
|
190 | | x 84fcb0dfe17b: C-A0 | |
191 | |/ |
|
191 | |/ | |
192 | @ ea207398892e: ROOT |
|
192 | @ ea207398892e: ROOT | |
193 |
|
193 | |||
194 | $ hg debugobsolete |
|
194 | $ hg debugobsolete | |
195 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
195 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
196 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
196 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
197 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
197 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
198 |
|
198 | |||
199 | Actual testing |
|
199 | Actual testing | |
200 | -------------- |
|
200 | -------------- | |
201 |
|
201 | |||
202 | $ testrevs 'desc("C-A0")' |
|
202 | $ testrevs 'desc("C-A0")' | |
203 | ### Matched revisions### |
|
203 | ### Matched revisions### | |
204 | 84fcb0dfe17b: C-A0 |
|
204 | 84fcb0dfe17b: C-A0 | |
205 | ### Relevant markers ### |
|
205 | ### Relevant markers ### | |
206 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
206 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
207 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
207 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
208 | # bundling: 1 changesets found |
|
208 | # bundling: 1 changesets found | |
209 | ### Bundled markers ### |
|
209 | ### Bundled markers ### | |
210 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
210 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
211 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
211 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
212 | ### diff <relevant> <bundled> ### |
|
212 | ### diff <relevant> <bundled> ### | |
213 | ################################# |
|
213 | ################################# | |
214 |
|
214 | |||
215 | $ testrevs 'desc("C-B0")' |
|
215 | $ testrevs 'desc("C-B0")' | |
216 | ### Matched revisions### |
|
216 | ### Matched revisions### | |
217 | 29f93b1df87b: C-B0 |
|
217 | 29f93b1df87b: C-B0 | |
218 | ### Relevant markers ### |
|
218 | ### Relevant markers ### | |
219 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
219 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
220 | # bundling: 1 changesets found |
|
220 | # bundling: 1 changesets found | |
221 | ### Bundled markers ### |
|
221 | ### Bundled markers ### | |
222 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
222 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
223 | ### diff <relevant> <bundled> ### |
|
223 | ### diff <relevant> <bundled> ### | |
224 | ################################# |
|
224 | ################################# | |
225 |
|
225 | |||
226 | $ testrevs 'desc("C-A1")' |
|
226 | $ testrevs 'desc("C-A1")' | |
227 | ### Matched revisions### |
|
227 | ### Matched revisions### | |
228 | cf2c22470d67: C-A1 |
|
228 | cf2c22470d67: C-A1 | |
229 | ### Relevant markers ### |
|
229 | ### Relevant markers ### | |
230 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
230 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
231 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
231 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
232 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
232 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
233 | # bundling: 1 changesets found |
|
233 | # bundling: 1 changesets found | |
234 | ### Bundled markers ### |
|
234 | ### Bundled markers ### | |
235 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
235 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
236 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
236 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
237 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
237 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
238 | ### diff <relevant> <bundled> ### |
|
238 | ### diff <relevant> <bundled> ### | |
239 | ################################# |
|
239 | ################################# | |
240 |
|
240 | |||
241 | bundling multiple revisions |
|
241 | bundling multiple revisions | |
242 |
|
242 | |||
243 | $ testrevs 'desc("C-A")' |
|
243 | $ testrevs 'desc("C-A")' | |
244 | ### Matched revisions### |
|
244 | ### Matched revisions### | |
245 | 84fcb0dfe17b: C-A0 |
|
245 | 84fcb0dfe17b: C-A0 | |
246 | cf2c22470d67: C-A1 |
|
246 | cf2c22470d67: C-A1 | |
247 | ### Relevant markers ### |
|
247 | ### Relevant markers ### | |
248 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
248 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
249 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
249 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
250 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
250 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
251 | # bundling: 2 changesets found |
|
251 | # bundling: 2 changesets found | |
252 | ### Bundled markers ### |
|
252 | ### Bundled markers ### | |
253 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
253 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
254 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
254 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
255 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
255 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
256 | ### diff <relevant> <bundled> ### |
|
256 | ### diff <relevant> <bundled> ### | |
257 | ################################# |
|
257 | ################################# | |
258 |
|
258 | |||
259 | $ testrevs 'desc("C-")' |
|
259 | $ testrevs 'desc("C-")' | |
260 | ### Matched revisions### |
|
260 | ### Matched revisions### | |
261 | 29f93b1df87b: C-B0 |
|
261 | 29f93b1df87b: C-B0 | |
262 | 84fcb0dfe17b: C-A0 |
|
262 | 84fcb0dfe17b: C-A0 | |
263 | cf2c22470d67: C-A1 |
|
263 | cf2c22470d67: C-A1 | |
264 | ### Relevant markers ### |
|
264 | ### Relevant markers ### | |
265 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
265 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
266 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
266 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
267 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
267 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
268 | # bundling: 3 changesets found |
|
268 | # bundling: 3 changesets found | |
269 | ### Bundled markers ### |
|
269 | ### Bundled markers ### | |
270 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
270 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
271 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
271 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
272 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
272 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
273 | ### diff <relevant> <bundled> ### |
|
273 | ### diff <relevant> <bundled> ### | |
274 | ################################# |
|
274 | ################################# | |
275 |
|
275 | |||
276 | chain with precursors also pruned |
|
276 | chain with precursors also pruned | |
277 | ================================= |
|
277 | ================================= | |
278 |
|
278 | |||
279 | . A0 (also pruned) |
|
279 | . A0 (also pruned) | |
280 | . ⇠ø⇠◔ A1 |
|
280 | . ⇠ø⇠◔ A1 | |
281 | . | |
|
281 | . | | |
282 | . ● |
|
282 | . ● | |
283 |
|
283 | |||
284 | setup |
|
284 | setup | |
285 | ----- |
|
285 | ----- | |
286 |
|
286 | |||
287 | $ mktestrepo prune-inline |
|
287 | $ mktestrepo prune-inline | |
288 | $ mkcommit 'C-A0' |
|
288 | $ mkcommit 'C-A0' | |
289 | $ hg up 'desc("ROOT")' |
|
289 | $ hg up 'desc("ROOT")' | |
290 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
290 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
291 | $ mkcommit 'C-A1' |
|
291 | $ mkcommit 'C-A1' | |
292 | created new head |
|
292 | created new head | |
293 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
293 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
294 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
294 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
295 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
295 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
296 | $ hg up 'desc("ROOT")' |
|
296 | $ hg up 'desc("ROOT")' | |
297 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
297 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
298 | $ hg log --hidden -G |
|
298 | $ hg log --hidden -G | |
299 | o cf2c22470d67: C-A1 |
|
299 | o cf2c22470d67: C-A1 | |
300 | | |
|
300 | | | |
301 | | x 84fcb0dfe17b: C-A0 |
|
301 | | x 84fcb0dfe17b: C-A0 | |
302 | |/ |
|
302 | |/ | |
303 | @ ea207398892e: ROOT |
|
303 | @ ea207398892e: ROOT | |
304 |
|
304 | |||
305 | $ hg debugobsolete |
|
305 | $ hg debugobsolete | |
306 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
306 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
307 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
307 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
308 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
308 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
309 |
|
309 | |||
310 | Actual testing |
|
310 | Actual testing | |
311 | -------------- |
|
311 | -------------- | |
312 |
|
312 | |||
313 |
$ |
|
313 | $ testrevs 'desc("C-A0")' | |
|
314 | ### Matched revisions### | |||
|
315 | 84fcb0dfe17b: C-A0 | |||
|
316 | ### Relevant markers ### | |||
314 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
317 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
315 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
318 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
316 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
319 | # bundling: 1 changesets found | |
|
320 | ### Bundled markers ### | |||
|
321 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
322 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
323 | ### diff <relevant> <bundled> ### | |||
|
324 | ################################# | |||
|
325 | ||||
|
326 | $ testrevs 'desc("C-A1")' | |||
|
327 | ### Matched revisions### | |||
|
328 | cf2c22470d67: C-A1 | |||
|
329 | ### Relevant markers ### | |||
317 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
330 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
318 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
331 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
319 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
332 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
|
333 | # bundling: 1 changesets found | |||
|
334 | ### Bundled markers ### | |||
|
335 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
336 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
337 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
338 | ### diff <relevant> <bundled> ### | |||
|
339 | ################################# | |||
|
340 | ||||
|
341 | $ testrevs 'desc("C-A")' | |||
|
342 | ### Matched revisions### | |||
|
343 | 84fcb0dfe17b: C-A0 | |||
|
344 | cf2c22470d67: C-A1 | |||
|
345 | ### Relevant markers ### | |||
|
346 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
347 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
348 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
349 | # bundling: 2 changesets found | |||
|
350 | ### Bundled markers ### | |||
|
351 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
352 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
353 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |||
|
354 | ### diff <relevant> <bundled> ### | |||
|
355 | ################################# | |||
320 |
|
356 | |||
321 | chain with missing prune |
|
357 | chain with missing prune | |
322 | ======================== |
|
358 | ======================== | |
323 |
|
359 | |||
324 | . ⊗ B |
|
360 | . ⊗ B | |
325 | . | |
|
361 | . | | |
326 | . ⇠◌⇠◔ A1 |
|
362 | . ⇠◌⇠◔ A1 | |
327 | . | |
|
363 | . | | |
328 | . ● |
|
364 | . ● | |
329 |
|
365 | |||
330 | setup |
|
366 | setup | |
331 | ----- |
|
367 | ----- | |
332 |
|
368 | |||
333 | $ mktestrepo missing-prune |
|
369 | $ mktestrepo missing-prune | |
334 | $ mkcommit 'C-A0' |
|
370 | $ mkcommit 'C-A0' | |
335 | $ mkcommit 'C-B0' |
|
371 | $ mkcommit 'C-B0' | |
336 | $ hg up 'desc("ROOT")' |
|
372 | $ hg up 'desc("ROOT")' | |
337 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
373 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
338 | $ mkcommit 'C-A1' |
|
374 | $ mkcommit 'C-A1' | |
339 | created new head |
|
375 | created new head | |
340 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
376 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
341 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
377 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
342 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
378 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
343 |
|
379 | |||
344 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
380 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
345 |
|
381 | |||
346 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
382 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup | |
347 |
|
383 | |||
348 | $ hg up 'desc("ROOT")' |
|
384 | $ hg up 'desc("ROOT")' | |
349 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
385 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
350 | $ hg log --hidden -G |
|
386 | $ hg log --hidden -G | |
351 | o cf2c22470d67: C-A1 |
|
387 | o cf2c22470d67: C-A1 | |
352 | | |
|
388 | | | |
353 | @ ea207398892e: ROOT |
|
389 | @ ea207398892e: ROOT | |
354 |
|
390 | |||
355 | $ hg debugobsolete |
|
391 | $ hg debugobsolete | |
356 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
392 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
357 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
393 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
358 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
394 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
359 |
|
395 | |||
360 | Actual testing |
|
396 | Actual testing | |
361 | -------------- |
|
397 | -------------- | |
362 |
|
398 | |||
363 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
399 | $ hg debugobsolete --rev 'desc("C-A1")' | |
364 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
400 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
365 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
401 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
366 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
402 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
367 |
|
403 | |||
368 | chain with precursors also pruned |
|
404 | chain with precursors also pruned | |
369 | ================================= |
|
405 | ================================= | |
370 |
|
406 | |||
371 | . A0 (also pruned) |
|
407 | . A0 (also pruned) | |
372 | . ⇠◌⇠◔ A1 |
|
408 | . ⇠◌⇠◔ A1 | |
373 | . | |
|
409 | . | | |
374 | . ● |
|
410 | . ● | |
375 |
|
411 | |||
376 | setup |
|
412 | setup | |
377 | ----- |
|
413 | ----- | |
378 |
|
414 | |||
379 | $ mktestrepo prune-inline-missing |
|
415 | $ mktestrepo prune-inline-missing | |
380 | $ mkcommit 'C-A0' |
|
416 | $ mkcommit 'C-A0' | |
381 | $ hg up 'desc("ROOT")' |
|
417 | $ hg up 'desc("ROOT")' | |
382 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
418 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
383 | $ mkcommit 'C-A1' |
|
419 | $ mkcommit 'C-A1' | |
384 | created new head |
|
420 | created new head | |
385 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
421 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
386 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
422 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
387 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
423 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
388 |
|
424 | |||
389 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
425 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
390 |
|
426 | |||
391 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup |
|
427 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup | |
392 |
|
428 | |||
393 | $ hg up 'desc("ROOT")' |
|
429 | $ hg up 'desc("ROOT")' | |
394 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
430 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
395 | $ hg log --hidden -G |
|
431 | $ hg log --hidden -G | |
396 | o cf2c22470d67: C-A1 |
|
432 | o cf2c22470d67: C-A1 | |
397 | | |
|
433 | | | |
398 | @ ea207398892e: ROOT |
|
434 | @ ea207398892e: ROOT | |
399 |
|
435 | |||
400 | $ hg debugobsolete |
|
436 | $ hg debugobsolete | |
401 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
437 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
402 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
438 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
403 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
439 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
404 |
|
440 | |||
405 | Actual testing |
|
441 | Actual testing | |
406 | -------------- |
|
442 | -------------- | |
407 |
|
443 | |||
408 | $ hg debugobsolete --rev 'desc("C-A1")' |
|
444 | $ hg debugobsolete --rev 'desc("C-A1")' | |
409 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
445 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
410 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
446 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
411 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
447 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
412 |
|
448 | |||
413 | Chain with fold and split |
|
449 | Chain with fold and split | |
414 | ========================= |
|
450 | ========================= | |
415 |
|
451 | |||
416 | setup |
|
452 | setup | |
417 | ----- |
|
453 | ----- | |
418 |
|
454 | |||
419 | $ mktestrepo split-fold |
|
455 | $ mktestrepo split-fold | |
420 | $ mkcommit 'C-A' |
|
456 | $ mkcommit 'C-A' | |
421 | $ hg up 'desc("ROOT")' |
|
457 | $ hg up 'desc("ROOT")' | |
422 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
458 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
423 | $ mkcommit 'C-B' |
|
459 | $ mkcommit 'C-B' | |
424 | created new head |
|
460 | created new head | |
425 | $ hg up 'desc("ROOT")' |
|
461 | $ hg up 'desc("ROOT")' | |
426 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
462 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
427 | $ mkcommit 'C-C' |
|
463 | $ mkcommit 'C-C' | |
428 | created new head |
|
464 | created new head | |
429 | $ hg up 'desc("ROOT")' |
|
465 | $ hg up 'desc("ROOT")' | |
430 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
466 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
431 | $ mkcommit 'C-D' |
|
467 | $ mkcommit 'C-D' | |
432 | created new head |
|
468 | created new head | |
433 | $ hg up 'desc("ROOT")' |
|
469 | $ hg up 'desc("ROOT")' | |
434 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
470 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
435 | $ mkcommit 'C-E' |
|
471 | $ mkcommit 'C-E' | |
436 | created new head |
|
472 | created new head | |
437 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
|
473 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` | |
438 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
|
474 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split | |
439 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
|
475 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent | |
440 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
|
476 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 | |
441 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
|
477 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` | |
442 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
|
478 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` | |
443 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
|
479 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` | |
444 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
|
480 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` | |
445 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
|
481 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` | |
446 |
|
482 | |||
447 | $ hg up 'desc("ROOT")' |
|
483 | $ hg up 'desc("ROOT")' | |
448 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
484 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
449 | $ hg log --hidden -G |
|
485 | $ hg log --hidden -G | |
450 | o 2f20ff6509f0: C-E |
|
486 | o 2f20ff6509f0: C-E | |
451 | | |
|
487 | | | |
452 | | x 06dc9da25ef0: C-D |
|
488 | | x 06dc9da25ef0: C-D | |
453 | |/ |
|
489 | |/ | |
454 | | x 27ec657ca21d: C-C |
|
490 | | x 27ec657ca21d: C-C | |
455 | |/ |
|
491 | |/ | |
456 | | x a9b9da38ed96: C-B |
|
492 | | x a9b9da38ed96: C-B | |
457 | |/ |
|
493 | |/ | |
458 | | x 9ac430e15fca: C-A |
|
494 | | x 9ac430e15fca: C-A | |
459 | |/ |
|
495 | |/ | |
460 | @ ea207398892e: ROOT |
|
496 | @ ea207398892e: ROOT | |
461 |
|
497 | |||
462 | $ hg debugobsolete |
|
498 | $ hg debugobsolete | |
463 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
499 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
464 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
500 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
465 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
501 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
466 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
502 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
467 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
503 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
468 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
504 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
469 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
505 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
470 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
506 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
471 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
507 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
472 |
|
508 | |||
473 | Actual testing |
|
509 | Actual testing | |
474 | -------------- |
|
510 | -------------- | |
475 |
|
511 | |||
476 | $ hg debugobsolete --rev 'desc("C-A")' |
|
512 | $ hg debugobsolete --rev 'desc("C-A")' | |
477 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
513 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
478 | $ hg debugobsolete --rev 'desc("C-B")' |
|
514 | $ hg debugobsolete --rev 'desc("C-B")' | |
479 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
515 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
480 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
516 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
481 | $ hg debugobsolete --rev 'desc("C-C")' |
|
517 | $ hg debugobsolete --rev 'desc("C-C")' | |
482 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
518 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
483 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
519 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
484 | $ hg debugobsolete --rev 'desc("C-D")' |
|
520 | $ hg debugobsolete --rev 'desc("C-D")' | |
485 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
521 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
486 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
522 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
487 | $ hg debugobsolete --rev 'desc("C-E")' |
|
523 | $ hg debugobsolete --rev 'desc("C-E")' | |
488 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
524 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
489 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
525 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
490 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
526 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
491 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
527 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
492 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
528 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
493 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
529 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
494 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
530 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
495 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
531 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
496 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
532 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
497 |
|
533 | |||
498 | changeset pruned on its own |
|
534 | changeset pruned on its own | |
499 | =========================== |
|
535 | =========================== | |
500 |
|
536 | |||
501 | . ⊗ B |
|
537 | . ⊗ B | |
502 | . | |
|
538 | . | | |
503 | . ◕ A |
|
539 | . ◕ A | |
504 | . | |
|
540 | . | | |
505 | . ● |
|
541 | . ● | |
506 |
|
542 | |||
507 | setup |
|
543 | setup | |
508 | ----- |
|
544 | ----- | |
509 |
|
545 | |||
510 | $ mktestrepo lonely-prune |
|
546 | $ mktestrepo lonely-prune | |
511 | $ hg up 'desc("ROOT")' |
|
547 | $ hg up 'desc("ROOT")' | |
512 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
548 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
513 | $ mkcommit 'C-A' |
|
549 | $ mkcommit 'C-A' | |
514 | $ mkcommit 'C-B' |
|
550 | $ mkcommit 'C-B' | |
515 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
|
551 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` | |
516 |
|
552 | |||
517 | $ hg up 'desc("ROOT")' |
|
553 | $ hg up 'desc("ROOT")' | |
518 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
554 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
519 | $ hg log --hidden -G |
|
555 | $ hg log --hidden -G | |
520 | x cefb651fc2fd: C-B |
|
556 | x cefb651fc2fd: C-B | |
521 | | |
|
557 | | | |
522 | o 9ac430e15fca: C-A |
|
558 | o 9ac430e15fca: C-A | |
523 | | |
|
559 | | | |
524 | @ ea207398892e: ROOT |
|
560 | @ ea207398892e: ROOT | |
525 |
|
561 | |||
526 | $ hg debugobsolete |
|
562 | $ hg debugobsolete | |
527 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
563 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
528 |
|
564 | |||
529 | Actual testing |
|
565 | Actual testing | |
530 | -------------- |
|
566 | -------------- | |
531 | $ hg debugobsolete --rev 'desc("C-A")' |
|
567 | $ hg debugobsolete --rev 'desc("C-A")' | |
532 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
568 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
533 | $ hg debugobsolete --hidden --rev 'desc("C-B")' |
|
569 | $ hg debugobsolete --hidden --rev 'desc("C-B")' | |
534 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
570 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
General Comments 0
You need to be logged in to leave comments.
Login now