Show More
| @@ -1,1398 +1,1398 | |||||
| 1 | ================================================== |
|
1 | ================================================== | |
| 2 | Test obsmarkers interaction with bundle and strip |
|
2 | Test obsmarkers interaction with bundle and strip | |
| 3 | ================================================== |
|
3 | ================================================== | |
| 4 |
|
4 | |||
| 5 | Setup a repository with various case |
|
5 | Setup a repository with various case | |
| 6 | ==================================== |
|
6 | ==================================== | |
| 7 |
|
7 | |||
| 8 | Config setup |
|
8 | Config setup | |
| 9 | ------------ |
|
9 | ------------ | |
| 10 |
|
10 | |||
| 11 | $ cat >> $HGRCPATH <<EOF |
|
11 | $ cat >> $HGRCPATH <<EOF | |
| 12 | > [ui] |
|
12 | > [ui] | |
| 13 | > # simpler log output |
|
13 | > # simpler log output | |
| 14 | > logtemplate = "{node|short}: {desc}\n" |
|
14 | > logtemplate = "{node|short}: {desc}\n" | |
| 15 | > |
|
15 | > | |
| 16 | > [experimental] |
|
16 | > [experimental] | |
| 17 | > # enable evolution |
|
17 | > # enable evolution | |
| 18 | > evolution=true |
|
18 | > evolution=true | |
| 19 | > |
|
19 | > | |
| 20 | > # include obsmarkers in bundle |
|
20 | > # include obsmarkers in bundle | |
| 21 |
> |
|
21 | > evolution.bundle-obsmarker = yes | |
| 22 | > |
|
22 | > | |
| 23 | > [extensions] |
|
23 | > [extensions] | |
| 24 | > # needed for some tests |
|
24 | > # needed for some tests | |
| 25 | > strip = |
|
25 | > strip = | |
| 26 | > [defaults] |
|
26 | > [defaults] | |
| 27 | > # we'll query many hidden changeset |
|
27 | > # we'll query many hidden changeset | |
| 28 | > debugobsolete = --hidden |
|
28 | > debugobsolete = --hidden | |
| 29 | > EOF |
|
29 | > EOF | |
| 30 |
|
30 | |||
| 31 | $ mkcommit() { |
|
31 | $ mkcommit() { | |
| 32 | > echo "$1" > "$1" |
|
32 | > echo "$1" > "$1" | |
| 33 | > hg add "$1" |
|
33 | > hg add "$1" | |
| 34 | > hg ci -m "$1" |
|
34 | > hg ci -m "$1" | |
| 35 | > } |
|
35 | > } | |
| 36 |
|
36 | |||
| 37 | $ getid() { |
|
37 | $ getid() { | |
| 38 | > hg log --hidden --template '{node}\n' --rev "$1" |
|
38 | > hg log --hidden --template '{node}\n' --rev "$1" | |
| 39 | > } |
|
39 | > } | |
| 40 |
|
40 | |||
| 41 | $ mktestrepo () { |
|
41 | $ mktestrepo () { | |
| 42 | > [ -n "$1" ] || exit 1 |
|
42 | > [ -n "$1" ] || exit 1 | |
| 43 | > cd $TESTTMP |
|
43 | > cd $TESTTMP | |
| 44 | > hg init $1 |
|
44 | > hg init $1 | |
| 45 | > cd $1 |
|
45 | > cd $1 | |
| 46 | > mkcommit ROOT |
|
46 | > mkcommit ROOT | |
| 47 | > } |
|
47 | > } | |
| 48 |
|
48 | |||
| 49 | Function to compare the expected bundled obsmarkers with the actually bundled |
|
49 | Function to compare the expected bundled obsmarkers with the actually bundled | |
| 50 | obsmarkers. It also check the obsmarkers backed up during strip. |
|
50 | obsmarkers. It also check the obsmarkers backed up during strip. | |
| 51 |
|
51 | |||
| 52 | $ testrevs () { |
|
52 | $ testrevs () { | |
| 53 | > revs="$1" |
|
53 | > revs="$1" | |
| 54 | > testname=`basename \`pwd\`` |
|
54 | > testname=`basename \`pwd\`` | |
| 55 | > revsname=`hg --hidden log -T '-{desc}' --rev "${revs}"` |
|
55 | > revsname=`hg --hidden log -T '-{desc}' --rev "${revs}"` | |
| 56 | > prefix="${TESTTMP}/${testname}${revsname}" |
|
56 | > prefix="${TESTTMP}/${testname}${revsname}" | |
| 57 | > markersfile="${prefix}-relevant-markers.txt" |
|
57 | > markersfile="${prefix}-relevant-markers.txt" | |
| 58 | > exclufile="${prefix}-exclusive-markers.txt" |
|
58 | > exclufile="${prefix}-exclusive-markers.txt" | |
| 59 | > bundlefile="${prefix}-bundle.hg" |
|
59 | > bundlefile="${prefix}-bundle.hg" | |
| 60 | > contentfile="${prefix}-bundle-markers.hg" |
|
60 | > contentfile="${prefix}-bundle-markers.hg" | |
| 61 | > stripcontentfile="${prefix}-bundle-markers.hg" |
|
61 | > stripcontentfile="${prefix}-bundle-markers.hg" | |
| 62 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" |
|
62 | > hg debugobsolete --hidden --rev "${revs}" | sed 's/^/ /' > "${markersfile}" | |
| 63 | > hg debugobsolete --hidden --rev "${revs}" --exclusive | sed 's/^/ /' > "${exclufile}" |
|
63 | > hg debugobsolete --hidden --rev "${revs}" --exclusive | sed 's/^/ /' > "${exclufile}" | |
| 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 --part-type obsmarkers "${bundlefile}" | sed 1,3d > "${contentfile}" |
|
70 | > hg debugbundle --part-type obsmarkers "${bundlefile}" | sed 1,3d > "${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 | > echo '### Exclusive markers ###' |
|
76 | > echo '### Exclusive markers ###' | |
| 77 | > cat "${exclufile}" |
|
77 | > cat "${exclufile}" | |
| 78 | > # if the matched revs do not have children, we also check the result of strip |
|
78 | > # if the matched revs do not have children, we also check the result of strip | |
| 79 | > children=`hg log --hidden --rev "((${revs})::) - (${revs})"` |
|
79 | > children=`hg log --hidden --rev "((${revs})::) - (${revs})"` | |
| 80 | > if [ -z "$children" ]; |
|
80 | > if [ -z "$children" ]; | |
| 81 | > then |
|
81 | > then | |
| 82 | > printf "# stripping: " |
|
82 | > printf "# stripping: " | |
| 83 | > prestripfile="${prefix}-pre-strip.txt" |
|
83 | > prestripfile="${prefix}-pre-strip.txt" | |
| 84 | > poststripfile="${prefix}-post-strip.txt" |
|
84 | > poststripfile="${prefix}-post-strip.txt" | |
| 85 | > strippedfile="${prefix}-stripped-markers.txt" |
|
85 | > strippedfile="${prefix}-stripped-markers.txt" | |
| 86 | > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${prestripfile}" |
|
86 | > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${prestripfile}" | |
| 87 | > hg strip --hidden --rev "${revs}" |
|
87 | > hg strip --hidden --rev "${revs}" | |
| 88 | > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${poststripfile}" |
|
88 | > hg debugobsolete --hidden | sort | sed 's/^/ /' > "${poststripfile}" | |
| 89 | > hg debugbundle --part-type obsmarkers .hg/strip-backup/* | sed 1,3d > "${stripcontentfile}" |
|
89 | > hg debugbundle --part-type obsmarkers .hg/strip-backup/* | sed 1,3d > "${stripcontentfile}" | |
| 90 | > echo '### Backup markers ###' |
|
90 | > echo '### Backup markers ###' | |
| 91 | > cat "${stripcontentfile}" |
|
91 | > cat "${stripcontentfile}" | |
| 92 | > echo '### diff <relevant> <backed-up> ###' |
|
92 | > echo '### diff <relevant> <backed-up> ###' | |
| 93 | > cmp "${markersfile}" "${stripcontentfile}" || diff -u "${markersfile}" "${stripcontentfile}" |
|
93 | > cmp "${markersfile}" "${stripcontentfile}" || diff -u "${markersfile}" "${stripcontentfile}" | |
| 94 | > echo '#################################' |
|
94 | > echo '#################################' | |
| 95 | > cat "${prestripfile}" "${poststripfile}" | sort | uniq -u > "${strippedfile}" |
|
95 | > cat "${prestripfile}" "${poststripfile}" | sort | uniq -u > "${strippedfile}" | |
| 96 | > echo '### Stripped markers ###' |
|
96 | > echo '### Stripped markers ###' | |
| 97 | > cat "${strippedfile}" |
|
97 | > cat "${strippedfile}" | |
| 98 | > echo '### diff <exclusive> <stripped> ###' |
|
98 | > echo '### diff <exclusive> <stripped> ###' | |
| 99 | > cmp "${exclufile}" "${strippedfile}" || diff -u "${exclufile}" "${strippedfile}" |
|
99 | > cmp "${exclufile}" "${strippedfile}" || diff -u "${exclufile}" "${strippedfile}" | |
| 100 | > echo '#################################' |
|
100 | > echo '#################################' | |
| 101 | > # restore and clean up repo for the next test |
|
101 | > # restore and clean up repo for the next test | |
| 102 | > hg unbundle .hg/strip-backup/* | sed 's/^/# unbundling: /' |
|
102 | > hg unbundle .hg/strip-backup/* | sed 's/^/# unbundling: /' | |
| 103 | > # clean up directory for the next test |
|
103 | > # clean up directory for the next test | |
| 104 | > rm .hg/strip-backup/* |
|
104 | > rm .hg/strip-backup/* | |
| 105 | > fi |
|
105 | > fi | |
| 106 | > } |
|
106 | > } | |
| 107 |
|
107 | |||
| 108 | root setup |
|
108 | root setup | |
| 109 | ------------- |
|
109 | ------------- | |
| 110 |
|
110 | |||
| 111 | simple chain |
|
111 | simple chain | |
| 112 | ============ |
|
112 | ============ | |
| 113 |
|
113 | |||
| 114 | . A0 |
|
114 | . A0 | |
| 115 | . ⇠ø⇠◔ A1 |
|
115 | . ⇠ø⇠◔ A1 | |
| 116 | . |/ |
|
116 | . |/ | |
| 117 | . ● |
|
117 | . ● | |
| 118 |
|
118 | |||
| 119 | setup |
|
119 | setup | |
| 120 | ----- |
|
120 | ----- | |
| 121 |
|
121 | |||
| 122 | $ mktestrepo simple-chain |
|
122 | $ mktestrepo simple-chain | |
| 123 | $ mkcommit 'C-A0' |
|
123 | $ mkcommit 'C-A0' | |
| 124 | $ hg up 'desc("ROOT")' |
|
124 | $ hg up 'desc("ROOT")' | |
| 125 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
125 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 126 | $ mkcommit 'C-A1' |
|
126 | $ mkcommit 'C-A1' | |
| 127 | created new head |
|
127 | created new head | |
| 128 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
128 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
| 129 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 |
|
129 | $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 | |
| 130 | obsoleted 1 changesets |
|
130 | obsoleted 1 changesets | |
| 131 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` |
|
131 | $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'` | |
| 132 |
|
132 | |||
| 133 | $ hg up 'desc("ROOT")' |
|
133 | $ hg up 'desc("ROOT")' | |
| 134 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
134 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 135 | $ hg log --hidden -G |
|
135 | $ hg log --hidden -G | |
| 136 | o cf2c22470d67: C-A1 |
|
136 | o cf2c22470d67: C-A1 | |
| 137 | | |
|
137 | | | |
| 138 | | x 84fcb0dfe17b: C-A0 |
|
138 | | x 84fcb0dfe17b: C-A0 | |
| 139 | |/ |
|
139 | |/ | |
| 140 | @ ea207398892e: ROOT |
|
140 | @ ea207398892e: ROOT | |
| 141 |
|
141 | |||
| 142 | $ hg debugobsolete |
|
142 | $ hg debugobsolete | |
| 143 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
143 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 144 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
144 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 145 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
145 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 146 |
|
146 | |||
| 147 | Actual testing |
|
147 | Actual testing | |
| 148 | -------------- |
|
148 | -------------- | |
| 149 |
|
149 | |||
| 150 | $ testrevs 'desc("C-A0")' |
|
150 | $ testrevs 'desc("C-A0")' | |
| 151 | ### Matched revisions### |
|
151 | ### Matched revisions### | |
| 152 | 84fcb0dfe17b: C-A0 |
|
152 | 84fcb0dfe17b: C-A0 | |
| 153 | ### Relevant markers ### |
|
153 | ### Relevant markers ### | |
| 154 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
154 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 155 | # bundling: 1 changesets found |
|
155 | # bundling: 1 changesets found | |
| 156 | ### Bundled markers ### |
|
156 | ### Bundled markers ### | |
| 157 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
157 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 158 | ### diff <relevant> <bundled> ### |
|
158 | ### diff <relevant> <bundled> ### | |
| 159 | ################################# |
|
159 | ################################# | |
| 160 | ### Exclusive markers ### |
|
160 | ### Exclusive markers ### | |
| 161 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob) |
|
161 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob) | |
| 162 | ### Backup markers ### |
|
162 | ### Backup markers ### | |
| 163 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
163 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 164 | ### diff <relevant> <backed-up> ### |
|
164 | ### diff <relevant> <backed-up> ### | |
| 165 | ################################# |
|
165 | ################################# | |
| 166 | ### Stripped markers ### |
|
166 | ### Stripped markers ### | |
| 167 | ### diff <exclusive> <stripped> ### |
|
167 | ### diff <exclusive> <stripped> ### | |
| 168 | ################################# |
|
168 | ################################# | |
| 169 | # unbundling: adding changesets |
|
169 | # unbundling: adding changesets | |
| 170 | # unbundling: adding manifests |
|
170 | # unbundling: adding manifests | |
| 171 | # unbundling: adding file changes |
|
171 | # unbundling: adding file changes | |
| 172 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
172 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 173 | # unbundling: (run 'hg heads' to see heads) |
|
173 | # unbundling: (run 'hg heads' to see heads) | |
| 174 |
|
174 | |||
| 175 | $ testrevs 'desc("C-A1")' |
|
175 | $ testrevs 'desc("C-A1")' | |
| 176 | ### Matched revisions### |
|
176 | ### Matched revisions### | |
| 177 | cf2c22470d67: C-A1 |
|
177 | cf2c22470d67: C-A1 | |
| 178 | ### Relevant markers ### |
|
178 | ### Relevant markers ### | |
| 179 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
179 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 180 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
180 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 181 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
181 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 182 | # bundling: 1 changesets found |
|
182 | # bundling: 1 changesets found | |
| 183 | ### Bundled markers ### |
|
183 | ### Bundled markers ### | |
| 184 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
184 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 185 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
185 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 186 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
186 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 187 | ### diff <relevant> <bundled> ### |
|
187 | ### diff <relevant> <bundled> ### | |
| 188 | ################################# |
|
188 | ################################# | |
| 189 | ### Exclusive markers ### |
|
189 | ### Exclusive markers ### | |
| 190 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
190 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 191 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
191 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 192 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
|
192 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) | |
| 193 | ### Backup markers ### |
|
193 | ### Backup markers ### | |
| 194 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
194 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 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'} |
|
195 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 196 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
196 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 197 | ### diff <relevant> <backed-up> ### |
|
197 | ### diff <relevant> <backed-up> ### | |
| 198 | ################################# |
|
198 | ################################# | |
| 199 | ### Stripped markers ### |
|
199 | ### Stripped markers ### | |
| 200 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
200 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 201 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
201 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 202 | ### diff <exclusive> <stripped> ### |
|
202 | ### diff <exclusive> <stripped> ### | |
| 203 | ################################# |
|
203 | ################################# | |
| 204 | # unbundling: adding changesets |
|
204 | # unbundling: adding changesets | |
| 205 | # unbundling: adding manifests |
|
205 | # unbundling: adding manifests | |
| 206 | # unbundling: adding file changes |
|
206 | # unbundling: adding file changes | |
| 207 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
207 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 208 | # unbundling: 2 new obsolescence markers |
|
208 | # unbundling: 2 new obsolescence markers | |
| 209 | # unbundling: obsoleted 1 changesets |
|
209 | # unbundling: obsoleted 1 changesets | |
| 210 | # unbundling: new changesets cf2c22470d67 |
|
210 | # unbundling: new changesets cf2c22470d67 | |
| 211 | # unbundling: (run 'hg heads' to see heads) |
|
211 | # unbundling: (run 'hg heads' to see heads) | |
| 212 |
|
212 | |||
| 213 | $ testrevs 'desc("C-A")' |
|
213 | $ testrevs 'desc("C-A")' | |
| 214 | ### Matched revisions### |
|
214 | ### Matched revisions### | |
| 215 | 84fcb0dfe17b: C-A0 |
|
215 | 84fcb0dfe17b: C-A0 | |
| 216 | cf2c22470d67: C-A1 |
|
216 | cf2c22470d67: C-A1 | |
| 217 | ### Relevant markers ### |
|
217 | ### Relevant markers ### | |
| 218 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
218 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 219 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
219 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 220 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
220 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 221 | # bundling: 2 changesets found |
|
221 | # bundling: 2 changesets found | |
| 222 | ### Bundled markers ### |
|
222 | ### Bundled markers ### | |
| 223 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
223 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 224 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
224 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 225 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
225 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 226 | ### diff <relevant> <bundled> ### |
|
226 | ### diff <relevant> <bundled> ### | |
| 227 | ################################# |
|
227 | ################################# | |
| 228 | ### Exclusive markers ### |
|
228 | ### Exclusive markers ### | |
| 229 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
229 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 230 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
230 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 231 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
231 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 232 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob) |
|
232 | # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob) | |
| 233 | ### Backup markers ### |
|
233 | ### Backup markers ### | |
| 234 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
234 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 235 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
235 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 236 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
236 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 237 | ### diff <relevant> <backed-up> ### |
|
237 | ### diff <relevant> <backed-up> ### | |
| 238 | ################################# |
|
238 | ################################# | |
| 239 | ### Stripped markers ### |
|
239 | ### Stripped markers ### | |
| 240 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
240 | 84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 241 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
241 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 242 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
242 | a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 243 | ### diff <exclusive> <stripped> ### |
|
243 | ### diff <exclusive> <stripped> ### | |
| 244 | ################################# |
|
244 | ################################# | |
| 245 | # unbundling: adding changesets |
|
245 | # unbundling: adding changesets | |
| 246 | # unbundling: adding manifests |
|
246 | # unbundling: adding manifests | |
| 247 | # unbundling: adding file changes |
|
247 | # unbundling: adding file changes | |
| 248 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) |
|
248 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |
| 249 | # unbundling: 3 new obsolescence markers |
|
249 | # unbundling: 3 new obsolescence markers | |
| 250 | # unbundling: new changesets cf2c22470d67 |
|
250 | # unbundling: new changesets cf2c22470d67 | |
| 251 | # unbundling: (run 'hg heads' to see heads) |
|
251 | # unbundling: (run 'hg heads' to see heads) | |
| 252 |
|
252 | |||
| 253 | chain with prune children |
|
253 | chain with prune children | |
| 254 | ========================= |
|
254 | ========================= | |
| 255 |
|
255 | |||
| 256 | . ⇠⊗ B0 |
|
256 | . ⇠⊗ B0 | |
| 257 | . | |
|
257 | . | | |
| 258 | . ⇠ø⇠◔ A1 |
|
258 | . ⇠ø⇠◔ A1 | |
| 259 | . | |
|
259 | . | | |
| 260 | . ● |
|
260 | . ● | |
| 261 |
|
261 | |||
| 262 | setup |
|
262 | setup | |
| 263 | ----- |
|
263 | ----- | |
| 264 |
|
264 | |||
| 265 | $ mktestrepo prune |
|
265 | $ mktestrepo prune | |
| 266 | $ mkcommit 'C-A0' |
|
266 | $ mkcommit 'C-A0' | |
| 267 | $ mkcommit 'C-B0' |
|
267 | $ mkcommit 'C-B0' | |
| 268 | $ hg up 'desc("ROOT")' |
|
268 | $ hg up 'desc("ROOT")' | |
| 269 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
269 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 270 | $ mkcommit 'C-A1' |
|
270 | $ mkcommit 'C-A1' | |
| 271 | created new head |
|
271 | created new head | |
| 272 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
272 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
| 273 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
273 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
| 274 | obsoleted 1 changesets |
|
274 | obsoleted 1 changesets | |
| 275 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
275 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
| 276 | obsoleted 1 changesets |
|
276 | obsoleted 1 changesets | |
| 277 | $ hg up 'desc("ROOT")' |
|
277 | $ hg up 'desc("ROOT")' | |
| 278 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
278 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 279 | $ hg log --hidden -G |
|
279 | $ hg log --hidden -G | |
| 280 | o cf2c22470d67: C-A1 |
|
280 | o cf2c22470d67: C-A1 | |
| 281 | | |
|
281 | | | |
| 282 | | x 29f93b1df87b: C-B0 |
|
282 | | x 29f93b1df87b: C-B0 | |
| 283 | | | |
|
283 | | | | |
| 284 | | x 84fcb0dfe17b: C-A0 |
|
284 | | x 84fcb0dfe17b: C-A0 | |
| 285 | |/ |
|
285 | |/ | |
| 286 | @ ea207398892e: ROOT |
|
286 | @ ea207398892e: ROOT | |
| 287 |
|
287 | |||
| 288 | $ hg debugobsolete |
|
288 | $ hg debugobsolete | |
| 289 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
289 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 290 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
290 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 291 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
291 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 292 |
|
292 | |||
| 293 | Actual testing |
|
293 | Actual testing | |
| 294 | -------------- |
|
294 | -------------- | |
| 295 |
|
295 | |||
| 296 | $ testrevs 'desc("C-A0")' |
|
296 | $ testrevs 'desc("C-A0")' | |
| 297 | ### Matched revisions### |
|
297 | ### Matched revisions### | |
| 298 | 84fcb0dfe17b: C-A0 |
|
298 | 84fcb0dfe17b: C-A0 | |
| 299 | ### Relevant markers ### |
|
299 | ### Relevant markers ### | |
| 300 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
300 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 301 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
301 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 302 | # bundling: 1 changesets found |
|
302 | # bundling: 1 changesets found | |
| 303 | ### Bundled markers ### |
|
303 | ### Bundled markers ### | |
| 304 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
304 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 305 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
305 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 306 | ### diff <relevant> <bundled> ### |
|
306 | ### diff <relevant> <bundled> ### | |
| 307 | ################################# |
|
307 | ################################# | |
| 308 | ### Exclusive markers ### |
|
308 | ### Exclusive markers ### | |
| 309 |
|
309 | |||
| 310 | (The strip markers is considered exclusive to the pruned changeset even if it |
|
310 | (The strip markers is considered exclusive to the pruned changeset even if it | |
| 311 | is also considered "relevant" to its parent. This allows to strip prune |
|
311 | is also considered "relevant" to its parent. This allows to strip prune | |
| 312 | markers. This avoid leaving prune markers from dead-end that could be |
|
312 | markers. This avoid leaving prune markers from dead-end that could be | |
| 313 | problematic) |
|
313 | problematic) | |
| 314 |
|
314 | |||
| 315 | $ testrevs 'desc("C-B0")' |
|
315 | $ testrevs 'desc("C-B0")' | |
| 316 | ### Matched revisions### |
|
316 | ### Matched revisions### | |
| 317 | 29f93b1df87b: C-B0 |
|
317 | 29f93b1df87b: C-B0 | |
| 318 | ### Relevant markers ### |
|
318 | ### Relevant markers ### | |
| 319 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
319 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 320 | # bundling: 1 changesets found |
|
320 | # bundling: 1 changesets found | |
| 321 | ### Bundled markers ### |
|
321 | ### Bundled markers ### | |
| 322 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
322 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 323 | ### diff <relevant> <bundled> ### |
|
323 | ### diff <relevant> <bundled> ### | |
| 324 | ################################# |
|
324 | ################################# | |
| 325 | ### Exclusive markers ### |
|
325 | ### Exclusive markers ### | |
| 326 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
326 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 327 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg (glob) |
|
327 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg (glob) | |
| 328 | ### Backup markers ### |
|
328 | ### Backup markers ### | |
| 329 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
329 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 330 | ### diff <relevant> <backed-up> ### |
|
330 | ### diff <relevant> <backed-up> ### | |
| 331 | ################################# |
|
331 | ################################# | |
| 332 | ### Stripped markers ### |
|
332 | ### Stripped markers ### | |
| 333 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
333 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 334 | ### diff <exclusive> <stripped> ### |
|
334 | ### diff <exclusive> <stripped> ### | |
| 335 | ################################# |
|
335 | ################################# | |
| 336 | # unbundling: adding changesets |
|
336 | # unbundling: adding changesets | |
| 337 | # unbundling: adding manifests |
|
337 | # unbundling: adding manifests | |
| 338 | # unbundling: adding file changes |
|
338 | # unbundling: adding file changes | |
| 339 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
339 | # unbundling: added 1 changesets with 1 changes to 1 files | |
| 340 | # unbundling: 1 new obsolescence markers |
|
340 | # unbundling: 1 new obsolescence markers | |
| 341 | # unbundling: (run 'hg update' to get a working copy) |
|
341 | # unbundling: (run 'hg update' to get a working copy) | |
| 342 |
|
342 | |||
| 343 | $ testrevs 'desc("C-A1")' |
|
343 | $ testrevs 'desc("C-A1")' | |
| 344 | ### Matched revisions### |
|
344 | ### Matched revisions### | |
| 345 | cf2c22470d67: C-A1 |
|
345 | cf2c22470d67: C-A1 | |
| 346 | ### Relevant markers ### |
|
346 | ### Relevant markers ### | |
| 347 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
347 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 348 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
348 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 349 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
349 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 350 | # bundling: 1 changesets found |
|
350 | # bundling: 1 changesets found | |
| 351 | ### Bundled markers ### |
|
351 | ### Bundled markers ### | |
| 352 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
352 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 353 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
353 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 354 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
354 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 355 | ### diff <relevant> <bundled> ### |
|
355 | ### diff <relevant> <bundled> ### | |
| 356 | ################################# |
|
356 | ################################# | |
| 357 | ### Exclusive markers ### |
|
357 | ### Exclusive markers ### | |
| 358 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
358 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 359 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
|
359 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) | |
| 360 | ### Backup markers ### |
|
360 | ### Backup markers ### | |
| 361 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
361 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 362 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
362 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 363 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
363 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 364 | ### diff <relevant> <backed-up> ### |
|
364 | ### diff <relevant> <backed-up> ### | |
| 365 | ################################# |
|
365 | ################################# | |
| 366 | ### Stripped markers ### |
|
366 | ### Stripped markers ### | |
| 367 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
367 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 368 | ### diff <exclusive> <stripped> ### |
|
368 | ### diff <exclusive> <stripped> ### | |
| 369 | ################################# |
|
369 | ################################# | |
| 370 | # unbundling: adding changesets |
|
370 | # unbundling: adding changesets | |
| 371 | # unbundling: adding manifests |
|
371 | # unbundling: adding manifests | |
| 372 | # unbundling: adding file changes |
|
372 | # unbundling: adding file changes | |
| 373 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
373 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 374 | # unbundling: 1 new obsolescence markers |
|
374 | # unbundling: 1 new obsolescence markers | |
| 375 | # unbundling: obsoleted 1 changesets |
|
375 | # unbundling: obsoleted 1 changesets | |
| 376 | # unbundling: new changesets cf2c22470d67 |
|
376 | # unbundling: new changesets cf2c22470d67 | |
| 377 | # unbundling: (run 'hg heads' to see heads) |
|
377 | # unbundling: (run 'hg heads' to see heads) | |
| 378 |
|
378 | |||
| 379 | bundling multiple revisions |
|
379 | bundling multiple revisions | |
| 380 |
|
380 | |||
| 381 | $ testrevs 'desc("C-A")' |
|
381 | $ testrevs 'desc("C-A")' | |
| 382 | ### Matched revisions### |
|
382 | ### Matched revisions### | |
| 383 | 84fcb0dfe17b: C-A0 |
|
383 | 84fcb0dfe17b: C-A0 | |
| 384 | cf2c22470d67: C-A1 |
|
384 | cf2c22470d67: C-A1 | |
| 385 | ### Relevant markers ### |
|
385 | ### Relevant markers ### | |
| 386 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
386 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 387 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
387 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 388 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
388 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 389 | # bundling: 2 changesets found |
|
389 | # bundling: 2 changesets found | |
| 390 | ### Bundled markers ### |
|
390 | ### Bundled markers ### | |
| 391 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
391 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 392 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
392 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 393 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
393 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 394 | ### diff <relevant> <bundled> ### |
|
394 | ### diff <relevant> <bundled> ### | |
| 395 | ################################# |
|
395 | ################################# | |
| 396 | ### Exclusive markers ### |
|
396 | ### Exclusive markers ### | |
| 397 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
397 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 398 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
398 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 399 |
|
399 | |||
| 400 | $ testrevs 'desc("C-")' |
|
400 | $ testrevs 'desc("C-")' | |
| 401 | ### Matched revisions### |
|
401 | ### Matched revisions### | |
| 402 | 29f93b1df87b: C-B0 |
|
402 | 29f93b1df87b: C-B0 | |
| 403 | 84fcb0dfe17b: C-A0 |
|
403 | 84fcb0dfe17b: C-A0 | |
| 404 | cf2c22470d67: C-A1 |
|
404 | cf2c22470d67: C-A1 | |
| 405 | ### Relevant markers ### |
|
405 | ### Relevant markers ### | |
| 406 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
406 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 407 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
407 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 408 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
408 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 409 | # bundling: 3 changesets found |
|
409 | # bundling: 3 changesets found | |
| 410 | ### Bundled markers ### |
|
410 | ### Bundled markers ### | |
| 411 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
411 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 412 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
412 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 413 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
413 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 414 | ### diff <relevant> <bundled> ### |
|
414 | ### diff <relevant> <bundled> ### | |
| 415 | ################################# |
|
415 | ################################# | |
| 416 | ### Exclusive markers ### |
|
416 | ### Exclusive markers ### | |
| 417 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
417 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 418 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
418 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 419 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
419 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 420 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg (glob) |
|
420 | # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg (glob) | |
| 421 | ### Backup markers ### |
|
421 | ### Backup markers ### | |
| 422 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
422 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 423 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
423 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 424 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
424 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 425 | ### diff <relevant> <backed-up> ### |
|
425 | ### diff <relevant> <backed-up> ### | |
| 426 | ################################# |
|
426 | ################################# | |
| 427 | ### Stripped markers ### |
|
427 | ### Stripped markers ### | |
| 428 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
428 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 429 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
429 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 430 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
430 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 431 | ### diff <exclusive> <stripped> ### |
|
431 | ### diff <exclusive> <stripped> ### | |
| 432 | ################################# |
|
432 | ################################# | |
| 433 | # unbundling: adding changesets |
|
433 | # unbundling: adding changesets | |
| 434 | # unbundling: adding manifests |
|
434 | # unbundling: adding manifests | |
| 435 | # unbundling: adding file changes |
|
435 | # unbundling: adding file changes | |
| 436 | # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) |
|
436 | # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads) | |
| 437 | # unbundling: 3 new obsolescence markers |
|
437 | # unbundling: 3 new obsolescence markers | |
| 438 | # unbundling: new changesets cf2c22470d67 |
|
438 | # unbundling: new changesets cf2c22470d67 | |
| 439 | # unbundling: (run 'hg heads' to see heads) |
|
439 | # unbundling: (run 'hg heads' to see heads) | |
| 440 |
|
440 | |||
| 441 | chain with precursors also pruned |
|
441 | chain with precursors also pruned | |
| 442 | ================================= |
|
442 | ================================= | |
| 443 |
|
443 | |||
| 444 | . A0 (also pruned) |
|
444 | . A0 (also pruned) | |
| 445 | . ⇠ø⇠◔ A1 |
|
445 | . ⇠ø⇠◔ A1 | |
| 446 | . | |
|
446 | . | | |
| 447 | . ● |
|
447 | . ● | |
| 448 |
|
448 | |||
| 449 | setup |
|
449 | setup | |
| 450 | ----- |
|
450 | ----- | |
| 451 |
|
451 | |||
| 452 | $ mktestrepo prune-inline |
|
452 | $ mktestrepo prune-inline | |
| 453 | $ mkcommit 'C-A0' |
|
453 | $ mkcommit 'C-A0' | |
| 454 | $ hg up 'desc("ROOT")' |
|
454 | $ hg up 'desc("ROOT")' | |
| 455 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
455 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 456 | $ mkcommit 'C-A1' |
|
456 | $ mkcommit 'C-A1' | |
| 457 | created new head |
|
457 | created new head | |
| 458 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
458 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
| 459 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
459 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
| 460 | obsoleted 1 changesets |
|
460 | obsoleted 1 changesets | |
| 461 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
461 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
| 462 | $ hg up 'desc("ROOT")' |
|
462 | $ hg up 'desc("ROOT")' | |
| 463 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
463 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 464 | $ hg log --hidden -G |
|
464 | $ hg log --hidden -G | |
| 465 | o cf2c22470d67: C-A1 |
|
465 | o cf2c22470d67: C-A1 | |
| 466 | | |
|
466 | | | |
| 467 | | x 84fcb0dfe17b: C-A0 |
|
467 | | x 84fcb0dfe17b: C-A0 | |
| 468 | |/ |
|
468 | |/ | |
| 469 | @ ea207398892e: ROOT |
|
469 | @ ea207398892e: ROOT | |
| 470 |
|
470 | |||
| 471 | $ hg debugobsolete |
|
471 | $ hg debugobsolete | |
| 472 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
472 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 473 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
473 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 474 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
474 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 475 |
|
475 | |||
| 476 | Actual testing |
|
476 | Actual testing | |
| 477 | -------------- |
|
477 | -------------- | |
| 478 |
|
478 | |||
| 479 | $ testrevs 'desc("C-A0")' |
|
479 | $ testrevs 'desc("C-A0")' | |
| 480 | ### Matched revisions### |
|
480 | ### Matched revisions### | |
| 481 | 84fcb0dfe17b: C-A0 |
|
481 | 84fcb0dfe17b: C-A0 | |
| 482 | ### Relevant markers ### |
|
482 | ### Relevant markers ### | |
| 483 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
483 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 484 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
484 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 485 | # bundling: 1 changesets found |
|
485 | # bundling: 1 changesets found | |
| 486 | ### Bundled markers ### |
|
486 | ### Bundled markers ### | |
| 487 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
487 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 488 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
488 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 489 | ### diff <relevant> <bundled> ### |
|
489 | ### diff <relevant> <bundled> ### | |
| 490 | ################################# |
|
490 | ################################# | |
| 491 | ### Exclusive markers ### |
|
491 | ### Exclusive markers ### | |
| 492 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob) |
|
492 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob) | |
| 493 | ### Backup markers ### |
|
493 | ### Backup markers ### | |
| 494 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
494 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 495 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
495 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 496 | ### diff <relevant> <backed-up> ### |
|
496 | ### diff <relevant> <backed-up> ### | |
| 497 | ################################# |
|
497 | ################################# | |
| 498 | ### Stripped markers ### |
|
498 | ### Stripped markers ### | |
| 499 | ### diff <exclusive> <stripped> ### |
|
499 | ### diff <exclusive> <stripped> ### | |
| 500 | ################################# |
|
500 | ################################# | |
| 501 | # unbundling: adding changesets |
|
501 | # unbundling: adding changesets | |
| 502 | # unbundling: adding manifests |
|
502 | # unbundling: adding manifests | |
| 503 | # unbundling: adding file changes |
|
503 | # unbundling: adding file changes | |
| 504 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
504 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 505 | # unbundling: (run 'hg heads' to see heads) |
|
505 | # unbundling: (run 'hg heads' to see heads) | |
| 506 |
|
506 | |||
| 507 | $ testrevs 'desc("C-A1")' |
|
507 | $ testrevs 'desc("C-A1")' | |
| 508 | ### Matched revisions### |
|
508 | ### Matched revisions### | |
| 509 | cf2c22470d67: C-A1 |
|
509 | cf2c22470d67: C-A1 | |
| 510 | ### Relevant markers ### |
|
510 | ### Relevant markers ### | |
| 511 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
511 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 512 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
512 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 513 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
513 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 514 | # bundling: 1 changesets found |
|
514 | # bundling: 1 changesets found | |
| 515 | ### Bundled markers ### |
|
515 | ### Bundled markers ### | |
| 516 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
516 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 517 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
517 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 518 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
518 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 519 | ### diff <relevant> <bundled> ### |
|
519 | ### diff <relevant> <bundled> ### | |
| 520 | ################################# |
|
520 | ################################# | |
| 521 | ### Exclusive markers ### |
|
521 | ### Exclusive markers ### | |
| 522 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
522 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 523 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
|
523 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) | |
| 524 | ### Backup markers ### |
|
524 | ### Backup markers ### | |
| 525 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
525 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 526 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
526 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 527 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
527 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 528 | ### diff <relevant> <backed-up> ### |
|
528 | ### diff <relevant> <backed-up> ### | |
| 529 | ################################# |
|
529 | ################################# | |
| 530 | ### Stripped markers ### |
|
530 | ### Stripped markers ### | |
| 531 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
531 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 532 | ### diff <exclusive> <stripped> ### |
|
532 | ### diff <exclusive> <stripped> ### | |
| 533 | ################################# |
|
533 | ################################# | |
| 534 | # unbundling: adding changesets |
|
534 | # unbundling: adding changesets | |
| 535 | # unbundling: adding manifests |
|
535 | # unbundling: adding manifests | |
| 536 | # unbundling: adding file changes |
|
536 | # unbundling: adding file changes | |
| 537 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
537 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 538 | # unbundling: 1 new obsolescence markers |
|
538 | # unbundling: 1 new obsolescence markers | |
| 539 | # unbundling: new changesets cf2c22470d67 |
|
539 | # unbundling: new changesets cf2c22470d67 | |
| 540 | # unbundling: (run 'hg heads' to see heads) |
|
540 | # unbundling: (run 'hg heads' to see heads) | |
| 541 |
|
541 | |||
| 542 | $ testrevs 'desc("C-A")' |
|
542 | $ testrevs 'desc("C-A")' | |
| 543 | ### Matched revisions### |
|
543 | ### Matched revisions### | |
| 544 | 84fcb0dfe17b: C-A0 |
|
544 | 84fcb0dfe17b: C-A0 | |
| 545 | cf2c22470d67: C-A1 |
|
545 | cf2c22470d67: C-A1 | |
| 546 | ### Relevant markers ### |
|
546 | ### Relevant markers ### | |
| 547 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
547 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 548 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
548 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 549 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
549 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 550 | # bundling: 2 changesets found |
|
550 | # bundling: 2 changesets found | |
| 551 | ### Bundled markers ### |
|
551 | ### Bundled markers ### | |
| 552 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
552 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 553 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
553 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 554 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
554 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 555 | ### diff <relevant> <bundled> ### |
|
555 | ### diff <relevant> <bundled> ### | |
| 556 | ################################# |
|
556 | ################################# | |
| 557 | ### Exclusive markers ### |
|
557 | ### Exclusive markers ### | |
| 558 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
558 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 559 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
559 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 560 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
560 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 561 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob) |
|
561 | # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob) | |
| 562 | ### Backup markers ### |
|
562 | ### Backup markers ### | |
| 563 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
563 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 564 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
564 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 565 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
565 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 566 | ### diff <relevant> <backed-up> ### |
|
566 | ### diff <relevant> <backed-up> ### | |
| 567 | ################################# |
|
567 | ################################# | |
| 568 | ### Stripped markers ### |
|
568 | ### Stripped markers ### | |
| 569 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
569 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 570 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
570 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 571 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
571 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 572 | ### diff <exclusive> <stripped> ### |
|
572 | ### diff <exclusive> <stripped> ### | |
| 573 | ################################# |
|
573 | ################################# | |
| 574 | # unbundling: adding changesets |
|
574 | # unbundling: adding changesets | |
| 575 | # unbundling: adding manifests |
|
575 | # unbundling: adding manifests | |
| 576 | # unbundling: adding file changes |
|
576 | # unbundling: adding file changes | |
| 577 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) |
|
577 | # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads) | |
| 578 | # unbundling: 3 new obsolescence markers |
|
578 | # unbundling: 3 new obsolescence markers | |
| 579 | # unbundling: new changesets cf2c22470d67 |
|
579 | # unbundling: new changesets cf2c22470d67 | |
| 580 | # unbundling: (run 'hg heads' to see heads) |
|
580 | # unbundling: (run 'hg heads' to see heads) | |
| 581 |
|
581 | |||
| 582 | chain with missing prune |
|
582 | chain with missing prune | |
| 583 | ======================== |
|
583 | ======================== | |
| 584 |
|
584 | |||
| 585 | . ⊗ B |
|
585 | . ⊗ B | |
| 586 | . | |
|
586 | . | | |
| 587 | . ⇠◌⇠◔ A1 |
|
587 | . ⇠◌⇠◔ A1 | |
| 588 | . | |
|
588 | . | | |
| 589 | . ● |
|
589 | . ● | |
| 590 |
|
590 | |||
| 591 | setup |
|
591 | setup | |
| 592 | ----- |
|
592 | ----- | |
| 593 |
|
593 | |||
| 594 | $ mktestrepo missing-prune |
|
594 | $ mktestrepo missing-prune | |
| 595 | $ mkcommit 'C-A0' |
|
595 | $ mkcommit 'C-A0' | |
| 596 | $ mkcommit 'C-B0' |
|
596 | $ mkcommit 'C-B0' | |
| 597 | $ hg up 'desc("ROOT")' |
|
597 | $ hg up 'desc("ROOT")' | |
| 598 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
598 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 599 | $ mkcommit 'C-A1' |
|
599 | $ mkcommit 'C-A1' | |
| 600 | created new head |
|
600 | created new head | |
| 601 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
601 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
| 602 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
602 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
| 603 | obsoleted 1 changesets |
|
603 | obsoleted 1 changesets | |
| 604 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` |
|
604 | $ hg debugobsolete --record-parents `getid 'desc("C-B0")'` | |
| 605 | obsoleted 1 changesets |
|
605 | obsoleted 1 changesets | |
| 606 |
|
606 | |||
| 607 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
607 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
| 608 |
|
608 | |||
| 609 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no |
|
609 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no | |
| 610 |
|
610 | |||
| 611 | $ hg up 'desc("ROOT")' |
|
611 | $ hg up 'desc("ROOT")' | |
| 612 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
612 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 613 | $ hg log --hidden -G |
|
613 | $ hg log --hidden -G | |
| 614 | o cf2c22470d67: C-A1 |
|
614 | o cf2c22470d67: C-A1 | |
| 615 | | |
|
615 | | | |
| 616 | @ ea207398892e: ROOT |
|
616 | @ ea207398892e: ROOT | |
| 617 |
|
617 | |||
| 618 | $ hg debugobsolete |
|
618 | $ hg debugobsolete | |
| 619 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
619 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 620 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
620 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 621 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
621 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 622 |
|
622 | |||
| 623 | Actual testing |
|
623 | Actual testing | |
| 624 | -------------- |
|
624 | -------------- | |
| 625 |
|
625 | |||
| 626 | $ testrevs 'desc("C-A1")' |
|
626 | $ testrevs 'desc("C-A1")' | |
| 627 | ### Matched revisions### |
|
627 | ### Matched revisions### | |
| 628 | cf2c22470d67: C-A1 |
|
628 | cf2c22470d67: C-A1 | |
| 629 | ### Relevant markers ### |
|
629 | ### Relevant markers ### | |
| 630 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
630 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 631 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
631 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 632 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
632 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 633 | # bundling: 1 changesets found |
|
633 | # bundling: 1 changesets found | |
| 634 | ### Bundled markers ### |
|
634 | ### Bundled markers ### | |
| 635 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
635 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 636 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
636 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 637 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
637 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 638 | ### diff <relevant> <bundled> ### |
|
638 | ### diff <relevant> <bundled> ### | |
| 639 | ################################# |
|
639 | ################################# | |
| 640 | ### Exclusive markers ### |
|
640 | ### Exclusive markers ### | |
| 641 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
641 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 642 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
642 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 643 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
643 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 644 | # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
|
644 | # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) | |
| 645 | ### Backup markers ### |
|
645 | ### Backup markers ### | |
| 646 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
646 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 647 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
647 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 648 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
648 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 649 | ### diff <relevant> <backed-up> ### |
|
649 | ### diff <relevant> <backed-up> ### | |
| 650 | ################################# |
|
650 | ################################# | |
| 651 | ### Stripped markers ### |
|
651 | ### Stripped markers ### | |
| 652 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
652 | 29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 653 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
653 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 654 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
654 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 655 | ### diff <exclusive> <stripped> ### |
|
655 | ### diff <exclusive> <stripped> ### | |
| 656 | ################################# |
|
656 | ################################# | |
| 657 | # unbundling: adding changesets |
|
657 | # unbundling: adding changesets | |
| 658 | # unbundling: adding manifests |
|
658 | # unbundling: adding manifests | |
| 659 | # unbundling: adding file changes |
|
659 | # unbundling: adding file changes | |
| 660 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
660 | # unbundling: added 1 changesets with 1 changes to 1 files | |
| 661 | # unbundling: 3 new obsolescence markers |
|
661 | # unbundling: 3 new obsolescence markers | |
| 662 | # unbundling: new changesets cf2c22470d67 |
|
662 | # unbundling: new changesets cf2c22470d67 | |
| 663 | # unbundling: (run 'hg update' to get a working copy) |
|
663 | # unbundling: (run 'hg update' to get a working copy) | |
| 664 |
|
664 | |||
| 665 | chain with precursors also pruned |
|
665 | chain with precursors also pruned | |
| 666 | ================================= |
|
666 | ================================= | |
| 667 |
|
667 | |||
| 668 | . A0 (also pruned) |
|
668 | . A0 (also pruned) | |
| 669 | . ⇠◌⇠◔ A1 |
|
669 | . ⇠◌⇠◔ A1 | |
| 670 | . | |
|
670 | . | | |
| 671 | . ● |
|
671 | . ● | |
| 672 |
|
672 | |||
| 673 | setup |
|
673 | setup | |
| 674 | ----- |
|
674 | ----- | |
| 675 |
|
675 | |||
| 676 | $ mktestrepo prune-inline-missing |
|
676 | $ mktestrepo prune-inline-missing | |
| 677 | $ mkcommit 'C-A0' |
|
677 | $ mkcommit 'C-A0' | |
| 678 | $ hg up 'desc("ROOT")' |
|
678 | $ hg up 'desc("ROOT")' | |
| 679 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
679 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 680 | $ mkcommit 'C-A1' |
|
680 | $ mkcommit 'C-A1' | |
| 681 | created new head |
|
681 | created new head | |
| 682 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` |
|
682 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'` | |
| 683 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` |
|
683 | $ hg debugobsolete --record-parents `getid 'desc("C-A0")'` | |
| 684 | obsoleted 1 changesets |
|
684 | obsoleted 1 changesets | |
| 685 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` |
|
685 | $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'` | |
| 686 |
|
686 | |||
| 687 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) |
|
687 | (it is annoying to create prune with parent data without the changeset, so we strip it after the fact) | |
| 688 |
|
688 | |||
| 689 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no |
|
689 | $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no | |
| 690 |
|
690 | |||
| 691 | $ hg up 'desc("ROOT")' |
|
691 | $ hg up 'desc("ROOT")' | |
| 692 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
692 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 693 | $ hg log --hidden -G |
|
693 | $ hg log --hidden -G | |
| 694 | o cf2c22470d67: C-A1 |
|
694 | o cf2c22470d67: C-A1 | |
| 695 | | |
|
695 | | | |
| 696 | @ ea207398892e: ROOT |
|
696 | @ ea207398892e: ROOT | |
| 697 |
|
697 | |||
| 698 | $ hg debugobsolete |
|
698 | $ hg debugobsolete | |
| 699 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
699 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 700 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
700 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 701 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
701 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 702 |
|
702 | |||
| 703 | Actual testing |
|
703 | Actual testing | |
| 704 | -------------- |
|
704 | -------------- | |
| 705 |
|
705 | |||
| 706 | $ testrevs 'desc("C-A1")' |
|
706 | $ testrevs 'desc("C-A1")' | |
| 707 | ### Matched revisions### |
|
707 | ### Matched revisions### | |
| 708 | cf2c22470d67: C-A1 |
|
708 | cf2c22470d67: C-A1 | |
| 709 | ### Relevant markers ### |
|
709 | ### Relevant markers ### | |
| 710 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
710 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 711 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
711 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 712 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
712 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 713 | # bundling: 1 changesets found |
|
713 | # bundling: 1 changesets found | |
| 714 | ### Bundled markers ### |
|
714 | ### Bundled markers ### | |
| 715 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
715 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 716 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
716 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 717 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
717 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 718 | ### diff <relevant> <bundled> ### |
|
718 | ### diff <relevant> <bundled> ### | |
| 719 | ################################# |
|
719 | ################################# | |
| 720 | ### Exclusive markers ### |
|
720 | ### Exclusive markers ### | |
| 721 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
721 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 722 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
722 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 723 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
723 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 724 | # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) |
|
724 | # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob) | |
| 725 | ### Backup markers ### |
|
725 | ### Backup markers ### | |
| 726 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
726 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 727 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
727 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 728 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
728 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 729 | ### diff <relevant> <backed-up> ### |
|
729 | ### diff <relevant> <backed-up> ### | |
| 730 | ################################# |
|
730 | ################################# | |
| 731 | ### Stripped markers ### |
|
731 | ### Stripped markers ### | |
| 732 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
732 | 84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 733 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
733 | 84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 734 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
734 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 735 | ### diff <exclusive> <stripped> ### |
|
735 | ### diff <exclusive> <stripped> ### | |
| 736 | ################################# |
|
736 | ################################# | |
| 737 | # unbundling: adding changesets |
|
737 | # unbundling: adding changesets | |
| 738 | # unbundling: adding manifests |
|
738 | # unbundling: adding manifests | |
| 739 | # unbundling: adding file changes |
|
739 | # unbundling: adding file changes | |
| 740 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
740 | # unbundling: added 1 changesets with 1 changes to 1 files | |
| 741 | # unbundling: 3 new obsolescence markers |
|
741 | # unbundling: 3 new obsolescence markers | |
| 742 | # unbundling: new changesets cf2c22470d67 |
|
742 | # unbundling: new changesets cf2c22470d67 | |
| 743 | # unbundling: (run 'hg update' to get a working copy) |
|
743 | # unbundling: (run 'hg update' to get a working copy) | |
| 744 |
|
744 | |||
| 745 | Chain with fold and split |
|
745 | Chain with fold and split | |
| 746 | ========================= |
|
746 | ========================= | |
| 747 |
|
747 | |||
| 748 | setup |
|
748 | setup | |
| 749 | ----- |
|
749 | ----- | |
| 750 |
|
750 | |||
| 751 | $ mktestrepo split-fold |
|
751 | $ mktestrepo split-fold | |
| 752 | $ mkcommit 'C-A' |
|
752 | $ mkcommit 'C-A' | |
| 753 | $ hg up 'desc("ROOT")' |
|
753 | $ hg up 'desc("ROOT")' | |
| 754 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
754 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 755 | $ mkcommit 'C-B' |
|
755 | $ mkcommit 'C-B' | |
| 756 | created new head |
|
756 | created new head | |
| 757 | $ hg up 'desc("ROOT")' |
|
757 | $ hg up 'desc("ROOT")' | |
| 758 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
758 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 759 | $ mkcommit 'C-C' |
|
759 | $ mkcommit 'C-C' | |
| 760 | created new head |
|
760 | created new head | |
| 761 | $ hg up 'desc("ROOT")' |
|
761 | $ hg up 'desc("ROOT")' | |
| 762 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
762 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 763 | $ mkcommit 'C-D' |
|
763 | $ mkcommit 'C-D' | |
| 764 | created new head |
|
764 | created new head | |
| 765 | $ hg up 'desc("ROOT")' |
|
765 | $ hg up 'desc("ROOT")' | |
| 766 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
766 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 767 | $ mkcommit 'C-E' |
|
767 | $ mkcommit 'C-E' | |
| 768 | created new head |
|
768 | created new head | |
| 769 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` |
|
769 | $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'` | |
| 770 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split |
|
770 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split | |
| 771 | obsoleted 1 changesets |
|
771 | obsoleted 1 changesets | |
| 772 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent |
|
772 | $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent | |
| 773 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 |
|
773 | $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 | |
| 774 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` |
|
774 | $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'` | |
| 775 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` |
|
775 | $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'` | |
| 776 | obsoleted 1 changesets |
|
776 | obsoleted 1 changesets | |
| 777 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` |
|
777 | $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'` | |
| 778 | obsoleted 1 changesets |
|
778 | obsoleted 1 changesets | |
| 779 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` |
|
779 | $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'` | |
| 780 | obsoleted 1 changesets |
|
780 | obsoleted 1 changesets | |
| 781 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` |
|
781 | $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'` | |
| 782 |
|
782 | |||
| 783 | $ hg up 'desc("ROOT")' |
|
783 | $ hg up 'desc("ROOT")' | |
| 784 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
784 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 785 | $ hg log --hidden -G |
|
785 | $ hg log --hidden -G | |
| 786 | o 2f20ff6509f0: C-E |
|
786 | o 2f20ff6509f0: C-E | |
| 787 | | |
|
787 | | | |
| 788 | | x 06dc9da25ef0: C-D |
|
788 | | x 06dc9da25ef0: C-D | |
| 789 | |/ |
|
789 | |/ | |
| 790 | | x 27ec657ca21d: C-C |
|
790 | | x 27ec657ca21d: C-C | |
| 791 | |/ |
|
791 | |/ | |
| 792 | | x a9b9da38ed96: C-B |
|
792 | | x a9b9da38ed96: C-B | |
| 793 | |/ |
|
793 | |/ | |
| 794 | | x 9ac430e15fca: C-A |
|
794 | | x 9ac430e15fca: C-A | |
| 795 | |/ |
|
795 | |/ | |
| 796 | @ ea207398892e: ROOT |
|
796 | @ ea207398892e: ROOT | |
| 797 |
|
797 | |||
| 798 | $ hg debugobsolete |
|
798 | $ hg debugobsolete | |
| 799 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
799 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 800 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
800 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 801 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
801 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 802 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
802 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 803 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
803 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 804 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
804 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 805 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
805 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 806 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
806 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 807 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
807 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 808 |
|
808 | |||
| 809 | Actual testing |
|
809 | Actual testing | |
| 810 | -------------- |
|
810 | -------------- | |
| 811 |
|
811 | |||
| 812 | $ testrevs 'desc("C-A")' |
|
812 | $ testrevs 'desc("C-A")' | |
| 813 | ### Matched revisions### |
|
813 | ### Matched revisions### | |
| 814 | 9ac430e15fca: C-A |
|
814 | 9ac430e15fca: C-A | |
| 815 | ### Relevant markers ### |
|
815 | ### Relevant markers ### | |
| 816 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
816 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 817 | # bundling: 1 changesets found |
|
817 | # bundling: 1 changesets found | |
| 818 | ### Bundled markers ### |
|
818 | ### Bundled markers ### | |
| 819 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
819 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 820 | ### diff <relevant> <bundled> ### |
|
820 | ### diff <relevant> <bundled> ### | |
| 821 | ################################# |
|
821 | ################################# | |
| 822 | ### Exclusive markers ### |
|
822 | ### Exclusive markers ### | |
| 823 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg (glob) |
|
823 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg (glob) | |
| 824 | ### Backup markers ### |
|
824 | ### Backup markers ### | |
| 825 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
825 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 826 | ### diff <relevant> <backed-up> ### |
|
826 | ### diff <relevant> <backed-up> ### | |
| 827 | ################################# |
|
827 | ################################# | |
| 828 | ### Stripped markers ### |
|
828 | ### Stripped markers ### | |
| 829 | ### diff <exclusive> <stripped> ### |
|
829 | ### diff <exclusive> <stripped> ### | |
| 830 | ################################# |
|
830 | ################################# | |
| 831 | # unbundling: adding changesets |
|
831 | # unbundling: adding changesets | |
| 832 | # unbundling: adding manifests |
|
832 | # unbundling: adding manifests | |
| 833 | # unbundling: adding file changes |
|
833 | # unbundling: adding file changes | |
| 834 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
834 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 835 | # unbundling: (run 'hg heads' to see heads) |
|
835 | # unbundling: (run 'hg heads' to see heads) | |
| 836 |
|
836 | |||
| 837 | $ testrevs 'desc("C-B")' |
|
837 | $ testrevs 'desc("C-B")' | |
| 838 | ### Matched revisions### |
|
838 | ### Matched revisions### | |
| 839 | a9b9da38ed96: C-B |
|
839 | a9b9da38ed96: C-B | |
| 840 | ### Relevant markers ### |
|
840 | ### Relevant markers ### | |
| 841 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
841 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 842 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
842 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 843 | # bundling: 1 changesets found |
|
843 | # bundling: 1 changesets found | |
| 844 | ### Bundled markers ### |
|
844 | ### Bundled markers ### | |
| 845 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
845 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 846 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
846 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 847 | ### diff <relevant> <bundled> ### |
|
847 | ### diff <relevant> <bundled> ### | |
| 848 | ################################# |
|
848 | ################################# | |
| 849 | ### Exclusive markers ### |
|
849 | ### Exclusive markers ### | |
| 850 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg (glob) |
|
850 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg (glob) | |
| 851 | ### Backup markers ### |
|
851 | ### Backup markers ### | |
| 852 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
852 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 853 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
853 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 854 | ### diff <relevant> <backed-up> ### |
|
854 | ### diff <relevant> <backed-up> ### | |
| 855 | ################################# |
|
855 | ################################# | |
| 856 | ### Stripped markers ### |
|
856 | ### Stripped markers ### | |
| 857 | ### diff <exclusive> <stripped> ### |
|
857 | ### diff <exclusive> <stripped> ### | |
| 858 | ################################# |
|
858 | ################################# | |
| 859 | # unbundling: adding changesets |
|
859 | # unbundling: adding changesets | |
| 860 | # unbundling: adding manifests |
|
860 | # unbundling: adding manifests | |
| 861 | # unbundling: adding file changes |
|
861 | # unbundling: adding file changes | |
| 862 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
862 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 863 | # unbundling: (run 'hg heads' to see heads) |
|
863 | # unbundling: (run 'hg heads' to see heads) | |
| 864 |
|
864 | |||
| 865 | $ testrevs 'desc("C-C")' |
|
865 | $ testrevs 'desc("C-C")' | |
| 866 | ### Matched revisions### |
|
866 | ### Matched revisions### | |
| 867 | 27ec657ca21d: C-C |
|
867 | 27ec657ca21d: C-C | |
| 868 | ### Relevant markers ### |
|
868 | ### Relevant markers ### | |
| 869 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
869 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 870 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
870 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 871 | # bundling: 1 changesets found |
|
871 | # bundling: 1 changesets found | |
| 872 | ### Bundled markers ### |
|
872 | ### Bundled markers ### | |
| 873 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
873 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 874 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
874 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 875 | ### diff <relevant> <bundled> ### |
|
875 | ### diff <relevant> <bundled> ### | |
| 876 | ################################# |
|
876 | ################################# | |
| 877 | ### Exclusive markers ### |
|
877 | ### Exclusive markers ### | |
| 878 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg (glob) |
|
878 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg (glob) | |
| 879 | ### Backup markers ### |
|
879 | ### Backup markers ### | |
| 880 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
880 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 881 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
881 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 882 | ### diff <relevant> <backed-up> ### |
|
882 | ### diff <relevant> <backed-up> ### | |
| 883 | ################################# |
|
883 | ################################# | |
| 884 | ### Stripped markers ### |
|
884 | ### Stripped markers ### | |
| 885 | ### diff <exclusive> <stripped> ### |
|
885 | ### diff <exclusive> <stripped> ### | |
| 886 | ################################# |
|
886 | ################################# | |
| 887 | # unbundling: adding changesets |
|
887 | # unbundling: adding changesets | |
| 888 | # unbundling: adding manifests |
|
888 | # unbundling: adding manifests | |
| 889 | # unbundling: adding file changes |
|
889 | # unbundling: adding file changes | |
| 890 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
890 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 891 | # unbundling: (run 'hg heads' to see heads) |
|
891 | # unbundling: (run 'hg heads' to see heads) | |
| 892 |
|
892 | |||
| 893 | $ testrevs 'desc("C-D")' |
|
893 | $ testrevs 'desc("C-D")' | |
| 894 | ### Matched revisions### |
|
894 | ### Matched revisions### | |
| 895 | 06dc9da25ef0: C-D |
|
895 | 06dc9da25ef0: C-D | |
| 896 | ### Relevant markers ### |
|
896 | ### Relevant markers ### | |
| 897 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
897 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 898 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
898 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 899 | # bundling: 1 changesets found |
|
899 | # bundling: 1 changesets found | |
| 900 | ### Bundled markers ### |
|
900 | ### Bundled markers ### | |
| 901 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
901 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 902 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
902 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 903 | ### diff <relevant> <bundled> ### |
|
903 | ### diff <relevant> <bundled> ### | |
| 904 | ################################# |
|
904 | ################################# | |
| 905 | ### Exclusive markers ### |
|
905 | ### Exclusive markers ### | |
| 906 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg (glob) |
|
906 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg (glob) | |
| 907 | ### Backup markers ### |
|
907 | ### Backup markers ### | |
| 908 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
908 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 909 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
909 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 910 | ### diff <relevant> <backed-up> ### |
|
910 | ### diff <relevant> <backed-up> ### | |
| 911 | ################################# |
|
911 | ################################# | |
| 912 | ### Stripped markers ### |
|
912 | ### Stripped markers ### | |
| 913 | ### diff <exclusive> <stripped> ### |
|
913 | ### diff <exclusive> <stripped> ### | |
| 914 | ################################# |
|
914 | ################################# | |
| 915 | # unbundling: adding changesets |
|
915 | # unbundling: adding changesets | |
| 916 | # unbundling: adding manifests |
|
916 | # unbundling: adding manifests | |
| 917 | # unbundling: adding file changes |
|
917 | # unbundling: adding file changes | |
| 918 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
918 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 919 | # unbundling: (run 'hg heads' to see heads) |
|
919 | # unbundling: (run 'hg heads' to see heads) | |
| 920 |
|
920 | |||
| 921 | $ testrevs 'desc("C-E")' |
|
921 | $ testrevs 'desc("C-E")' | |
| 922 | ### Matched revisions### |
|
922 | ### Matched revisions### | |
| 923 | 2f20ff6509f0: C-E |
|
923 | 2f20ff6509f0: C-E | |
| 924 | ### Relevant markers ### |
|
924 | ### Relevant markers ### | |
| 925 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
925 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 926 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
926 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 927 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
927 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 928 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
928 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 929 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
929 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 930 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
930 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 931 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
931 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 932 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
932 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 933 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
933 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 934 | # bundling: 1 changesets found |
|
934 | # bundling: 1 changesets found | |
| 935 | ### Bundled markers ### |
|
935 | ### Bundled markers ### | |
| 936 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
936 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 937 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
937 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 938 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
938 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 939 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
939 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 940 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
940 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 941 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
941 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 942 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
942 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 943 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
943 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 944 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
944 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 945 | ### diff <relevant> <bundled> ### |
|
945 | ### diff <relevant> <bundled> ### | |
| 946 | ################################# |
|
946 | ################################# | |
| 947 | ### Exclusive markers ### |
|
947 | ### Exclusive markers ### | |
| 948 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
948 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 949 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
949 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 950 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
950 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 951 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
951 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 952 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
952 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 953 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
953 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 954 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg (glob) |
|
954 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg (glob) | |
| 955 | ### Backup markers ### |
|
955 | ### Backup markers ### | |
| 956 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
956 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 957 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
957 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 958 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
958 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 959 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
959 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 960 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
960 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 961 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
961 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 962 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
962 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 963 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
963 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 964 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
964 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 965 | ### diff <relevant> <backed-up> ### |
|
965 | ### diff <relevant> <backed-up> ### | |
| 966 | ################################# |
|
966 | ################################# | |
| 967 | ### Stripped markers ### |
|
967 | ### Stripped markers ### | |
| 968 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
968 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 969 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
969 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 970 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
970 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 971 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
971 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 972 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
972 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 973 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
973 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 974 | ### diff <exclusive> <stripped> ### |
|
974 | ### diff <exclusive> <stripped> ### | |
| 975 | ################################# |
|
975 | ################################# | |
| 976 | # unbundling: adding changesets |
|
976 | # unbundling: adding changesets | |
| 977 | # unbundling: adding manifests |
|
977 | # unbundling: adding manifests | |
| 978 | # unbundling: adding file changes |
|
978 | # unbundling: adding file changes | |
| 979 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) |
|
979 | # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 980 | # unbundling: 6 new obsolescence markers |
|
980 | # unbundling: 6 new obsolescence markers | |
| 981 | # unbundling: obsoleted 3 changesets |
|
981 | # unbundling: obsoleted 3 changesets | |
| 982 | # unbundling: new changesets 2f20ff6509f0 |
|
982 | # unbundling: new changesets 2f20ff6509f0 | |
| 983 | # unbundling: (run 'hg heads' to see heads) |
|
983 | # unbundling: (run 'hg heads' to see heads) | |
| 984 |
|
984 | |||
| 985 | Bundle multiple revisions |
|
985 | Bundle multiple revisions | |
| 986 |
|
986 | |||
| 987 | * each part of the split |
|
987 | * each part of the split | |
| 988 |
|
988 | |||
| 989 | $ testrevs 'desc("C-B") + desc("C-C")' |
|
989 | $ testrevs 'desc("C-B") + desc("C-C")' | |
| 990 | ### Matched revisions### |
|
990 | ### Matched revisions### | |
| 991 | 27ec657ca21d: C-C |
|
991 | 27ec657ca21d: C-C | |
| 992 | a9b9da38ed96: C-B |
|
992 | a9b9da38ed96: C-B | |
| 993 | ### Relevant markers ### |
|
993 | ### Relevant markers ### | |
| 994 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
994 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 995 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
995 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 996 | # bundling: 2 changesets found |
|
996 | # bundling: 2 changesets found | |
| 997 | ### Bundled markers ### |
|
997 | ### Bundled markers ### | |
| 998 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
998 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 999 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
999 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1000 | ### diff <relevant> <bundled> ### |
|
1000 | ### diff <relevant> <bundled> ### | |
| 1001 | ################################# |
|
1001 | ################################# | |
| 1002 | ### Exclusive markers ### |
|
1002 | ### Exclusive markers ### | |
| 1003 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg (glob) |
|
1003 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg (glob) | |
| 1004 | ### Backup markers ### |
|
1004 | ### Backup markers ### | |
| 1005 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1005 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1006 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1006 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1007 | ### diff <relevant> <backed-up> ### |
|
1007 | ### diff <relevant> <backed-up> ### | |
| 1008 | ################################# |
|
1008 | ################################# | |
| 1009 | ### Stripped markers ### |
|
1009 | ### Stripped markers ### | |
| 1010 | ### diff <exclusive> <stripped> ### |
|
1010 | ### diff <exclusive> <stripped> ### | |
| 1011 | ################################# |
|
1011 | ################################# | |
| 1012 | # unbundling: adding changesets |
|
1012 | # unbundling: adding changesets | |
| 1013 | # unbundling: adding manifests |
|
1013 | # unbundling: adding manifests | |
| 1014 | # unbundling: adding file changes |
|
1014 | # unbundling: adding file changes | |
| 1015 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1015 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
| 1016 | # unbundling: (run 'hg heads' to see heads) |
|
1016 | # unbundling: (run 'hg heads' to see heads) | |
| 1017 |
|
1017 | |||
| 1018 | * top one and other divergent |
|
1018 | * top one and other divergent | |
| 1019 |
|
1019 | |||
| 1020 | $ testrevs 'desc("C-E") + desc("C-D")' |
|
1020 | $ testrevs 'desc("C-E") + desc("C-D")' | |
| 1021 | ### Matched revisions### |
|
1021 | ### Matched revisions### | |
| 1022 | 06dc9da25ef0: C-D |
|
1022 | 06dc9da25ef0: C-D | |
| 1023 | 2f20ff6509f0: C-E |
|
1023 | 2f20ff6509f0: C-E | |
| 1024 | ### Relevant markers ### |
|
1024 | ### Relevant markers ### | |
| 1025 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1025 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1026 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1026 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1027 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1027 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1028 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1028 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1029 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1029 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1030 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1030 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1031 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1031 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1032 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1032 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1033 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1033 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1034 | # bundling: 2 changesets found |
|
1034 | # bundling: 2 changesets found | |
| 1035 | ### Bundled markers ### |
|
1035 | ### Bundled markers ### | |
| 1036 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1036 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1037 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1037 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1038 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1038 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1039 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1039 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1040 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1040 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1041 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1041 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1042 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1042 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1043 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1043 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1044 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1044 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1045 | ### diff <relevant> <bundled> ### |
|
1045 | ### diff <relevant> <bundled> ### | |
| 1046 | ################################# |
|
1046 | ################################# | |
| 1047 | ### Exclusive markers ### |
|
1047 | ### Exclusive markers ### | |
| 1048 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1048 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1049 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1049 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1050 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1050 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1051 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1051 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1052 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1052 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1053 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1053 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1054 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1054 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1055 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg (glob) |
|
1055 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg (glob) | |
| 1056 | ### Backup markers ### |
|
1056 | ### Backup markers ### | |
| 1057 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1057 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1058 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1058 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1059 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1059 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1060 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1060 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1061 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1061 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1062 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1062 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1063 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1063 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1064 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1064 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1065 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1065 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1066 | ### diff <relevant> <backed-up> ### |
|
1066 | ### diff <relevant> <backed-up> ### | |
| 1067 | ################################# |
|
1067 | ################################# | |
| 1068 | ### Stripped markers ### |
|
1068 | ### Stripped markers ### | |
| 1069 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1069 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1070 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1070 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1071 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1071 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1072 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1072 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1073 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1073 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1074 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1074 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1075 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1075 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1076 | ### diff <exclusive> <stripped> ### |
|
1076 | ### diff <exclusive> <stripped> ### | |
| 1077 | ################################# |
|
1077 | ################################# | |
| 1078 | # unbundling: adding changesets |
|
1078 | # unbundling: adding changesets | |
| 1079 | # unbundling: adding manifests |
|
1079 | # unbundling: adding manifests | |
| 1080 | # unbundling: adding file changes |
|
1080 | # unbundling: adding file changes | |
| 1081 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1081 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
| 1082 | # unbundling: 7 new obsolescence markers |
|
1082 | # unbundling: 7 new obsolescence markers | |
| 1083 | # unbundling: obsoleted 2 changesets |
|
1083 | # unbundling: obsoleted 2 changesets | |
| 1084 | # unbundling: new changesets 2f20ff6509f0 |
|
1084 | # unbundling: new changesets 2f20ff6509f0 | |
| 1085 | # unbundling: (run 'hg heads' to see heads) |
|
1085 | # unbundling: (run 'hg heads' to see heads) | |
| 1086 |
|
1086 | |||
| 1087 | * top one and initial precursors |
|
1087 | * top one and initial precursors | |
| 1088 |
|
1088 | |||
| 1089 | $ testrevs 'desc("C-E") + desc("C-A")' |
|
1089 | $ testrevs 'desc("C-E") + desc("C-A")' | |
| 1090 | ### Matched revisions### |
|
1090 | ### Matched revisions### | |
| 1091 | 2f20ff6509f0: C-E |
|
1091 | 2f20ff6509f0: C-E | |
| 1092 | 9ac430e15fca: C-A |
|
1092 | 9ac430e15fca: C-A | |
| 1093 | ### Relevant markers ### |
|
1093 | ### Relevant markers ### | |
| 1094 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1094 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1095 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1095 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1096 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1096 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1097 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1097 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1098 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1098 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1099 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1099 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1100 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1100 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1101 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1101 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1102 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1102 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1103 | # bundling: 2 changesets found |
|
1103 | # bundling: 2 changesets found | |
| 1104 | ### Bundled markers ### |
|
1104 | ### Bundled markers ### | |
| 1105 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1105 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1106 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1106 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1107 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1107 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1108 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1108 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1109 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1109 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1110 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1110 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1111 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1111 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1112 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1112 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1113 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1113 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1114 | ### diff <relevant> <bundled> ### |
|
1114 | ### diff <relevant> <bundled> ### | |
| 1115 | ################################# |
|
1115 | ################################# | |
| 1116 | ### Exclusive markers ### |
|
1116 | ### Exclusive markers ### | |
| 1117 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1117 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1118 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1118 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1119 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1119 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1120 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1120 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1121 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1121 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1122 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1122 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1123 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg (glob) |
|
1123 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg (glob) | |
| 1124 | ### Backup markers ### |
|
1124 | ### Backup markers ### | |
| 1125 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1125 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1126 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1126 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1127 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1127 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1128 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1128 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1129 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1129 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1130 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1130 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1131 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1131 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1132 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1132 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1133 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1133 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1134 | ### diff <relevant> <backed-up> ### |
|
1134 | ### diff <relevant> <backed-up> ### | |
| 1135 | ################################# |
|
1135 | ################################# | |
| 1136 | ### Stripped markers ### |
|
1136 | ### Stripped markers ### | |
| 1137 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1137 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1138 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1138 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1139 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1139 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1140 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1140 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1141 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1141 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1142 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1142 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1143 | ### diff <exclusive> <stripped> ### |
|
1143 | ### diff <exclusive> <stripped> ### | |
| 1144 | ################################# |
|
1144 | ################################# | |
| 1145 | # unbundling: adding changesets |
|
1145 | # unbundling: adding changesets | |
| 1146 | # unbundling: adding manifests |
|
1146 | # unbundling: adding manifests | |
| 1147 | # unbundling: adding file changes |
|
1147 | # unbundling: adding file changes | |
| 1148 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1148 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
| 1149 | # unbundling: 6 new obsolescence markers |
|
1149 | # unbundling: 6 new obsolescence markers | |
| 1150 | # unbundling: obsoleted 3 changesets |
|
1150 | # unbundling: obsoleted 3 changesets | |
| 1151 | # unbundling: new changesets 2f20ff6509f0 |
|
1151 | # unbundling: new changesets 2f20ff6509f0 | |
| 1152 | # unbundling: (run 'hg heads' to see heads) |
|
1152 | # unbundling: (run 'hg heads' to see heads) | |
| 1153 |
|
1153 | |||
| 1154 | * top one and one of the split |
|
1154 | * top one and one of the split | |
| 1155 |
|
1155 | |||
| 1156 | $ testrevs 'desc("C-E") + desc("C-C")' |
|
1156 | $ testrevs 'desc("C-E") + desc("C-C")' | |
| 1157 | ### Matched revisions### |
|
1157 | ### Matched revisions### | |
| 1158 | 27ec657ca21d: C-C |
|
1158 | 27ec657ca21d: C-C | |
| 1159 | 2f20ff6509f0: C-E |
|
1159 | 2f20ff6509f0: C-E | |
| 1160 | ### Relevant markers ### |
|
1160 | ### Relevant markers ### | |
| 1161 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1161 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1162 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1162 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1163 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1163 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1164 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1164 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1165 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1165 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1166 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1166 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1167 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1167 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1168 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1168 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1169 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1169 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1170 | # bundling: 2 changesets found |
|
1170 | # bundling: 2 changesets found | |
| 1171 | ### Bundled markers ### |
|
1171 | ### Bundled markers ### | |
| 1172 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1172 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1173 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1173 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1174 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1174 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1175 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1175 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1176 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1176 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1177 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1177 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1178 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1178 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1179 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1179 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1180 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1180 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1181 | ### diff <relevant> <bundled> ### |
|
1181 | ### diff <relevant> <bundled> ### | |
| 1182 | ################################# |
|
1182 | ################################# | |
| 1183 | ### Exclusive markers ### |
|
1183 | ### Exclusive markers ### | |
| 1184 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1184 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1185 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1185 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1186 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1186 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1187 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1187 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1188 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1188 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1189 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1189 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1190 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1190 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1191 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg (glob) |
|
1191 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg (glob) | |
| 1192 | ### Backup markers ### |
|
1192 | ### Backup markers ### | |
| 1193 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1193 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1194 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1194 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1195 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1195 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1196 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1196 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1197 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1197 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1198 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1198 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1199 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1199 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1200 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1200 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1201 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1201 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1202 | ### diff <relevant> <backed-up> ### |
|
1202 | ### diff <relevant> <backed-up> ### | |
| 1203 | ################################# |
|
1203 | ################################# | |
| 1204 | ### Stripped markers ### |
|
1204 | ### Stripped markers ### | |
| 1205 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1205 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1206 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1206 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1207 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1207 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1208 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1208 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1209 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1209 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1210 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1210 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1211 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1211 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1212 | ### diff <exclusive> <stripped> ### |
|
1212 | ### diff <exclusive> <stripped> ### | |
| 1213 | ################################# |
|
1213 | ################################# | |
| 1214 | # unbundling: adding changesets |
|
1214 | # unbundling: adding changesets | |
| 1215 | # unbundling: adding manifests |
|
1215 | # unbundling: adding manifests | |
| 1216 | # unbundling: adding file changes |
|
1216 | # unbundling: adding file changes | |
| 1217 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) |
|
1217 | # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads) | |
| 1218 | # unbundling: 7 new obsolescence markers |
|
1218 | # unbundling: 7 new obsolescence markers | |
| 1219 | # unbundling: obsoleted 2 changesets |
|
1219 | # unbundling: obsoleted 2 changesets | |
| 1220 | # unbundling: new changesets 2f20ff6509f0 |
|
1220 | # unbundling: new changesets 2f20ff6509f0 | |
| 1221 | # unbundling: (run 'hg heads' to see heads) |
|
1221 | # unbundling: (run 'hg heads' to see heads) | |
| 1222 |
|
1222 | |||
| 1223 | * all |
|
1223 | * all | |
| 1224 |
|
1224 | |||
| 1225 | $ testrevs 'desc("C-")' |
|
1225 | $ testrevs 'desc("C-")' | |
| 1226 | ### Matched revisions### |
|
1226 | ### Matched revisions### | |
| 1227 | 06dc9da25ef0: C-D |
|
1227 | 06dc9da25ef0: C-D | |
| 1228 | 27ec657ca21d: C-C |
|
1228 | 27ec657ca21d: C-C | |
| 1229 | 2f20ff6509f0: C-E |
|
1229 | 2f20ff6509f0: C-E | |
| 1230 | 9ac430e15fca: C-A |
|
1230 | 9ac430e15fca: C-A | |
| 1231 | a9b9da38ed96: C-B |
|
1231 | a9b9da38ed96: C-B | |
| 1232 | ### Relevant markers ### |
|
1232 | ### Relevant markers ### | |
| 1233 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1233 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1234 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1234 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1235 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1235 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1236 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1236 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1237 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1237 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1238 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1238 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1239 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1239 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1240 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1240 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1241 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1241 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1242 | # bundling: 5 changesets found |
|
1242 | # bundling: 5 changesets found | |
| 1243 | ### Bundled markers ### |
|
1243 | ### Bundled markers ### | |
| 1244 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1244 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1245 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1245 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1246 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1246 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1247 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1247 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1248 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1248 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1249 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1249 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1250 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1250 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1251 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1251 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1252 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1252 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1253 | ### diff <relevant> <bundled> ### |
|
1253 | ### diff <relevant> <bundled> ### | |
| 1254 | ################################# |
|
1254 | ################################# | |
| 1255 | ### Exclusive markers ### |
|
1255 | ### Exclusive markers ### | |
| 1256 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1256 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1257 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1257 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1258 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1258 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1259 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1259 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1260 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1260 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1261 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1261 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1262 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1262 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1263 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1263 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1264 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1264 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1265 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg (glob) |
|
1265 | # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg (glob) | |
| 1266 | ### Backup markers ### |
|
1266 | ### Backup markers ### | |
| 1267 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1267 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1268 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1268 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1269 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1269 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1270 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1270 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1271 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1271 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1272 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1272 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1273 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1273 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1274 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1274 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1275 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1275 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1276 | ### diff <relevant> <backed-up> ### |
|
1276 | ### diff <relevant> <backed-up> ### | |
| 1277 | ################################# |
|
1277 | ################################# | |
| 1278 | ### Stripped markers ### |
|
1278 | ### Stripped markers ### | |
| 1279 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1279 | 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1280 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1280 | 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1281 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1281 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1282 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1282 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1283 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1283 | 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1284 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1284 | a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1285 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1285 | a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1286 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1286 | b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1287 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1287 | c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1288 | ### diff <exclusive> <stripped> ### |
|
1288 | ### diff <exclusive> <stripped> ### | |
| 1289 | ################################# |
|
1289 | ################################# | |
| 1290 | # unbundling: adding changesets |
|
1290 | # unbundling: adding changesets | |
| 1291 | # unbundling: adding manifests |
|
1291 | # unbundling: adding manifests | |
| 1292 | # unbundling: adding file changes |
|
1292 | # unbundling: adding file changes | |
| 1293 | # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) |
|
1293 | # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads) | |
| 1294 | # unbundling: 9 new obsolescence markers |
|
1294 | # unbundling: 9 new obsolescence markers | |
| 1295 | # unbundling: new changesets 2f20ff6509f0 |
|
1295 | # unbundling: new changesets 2f20ff6509f0 | |
| 1296 | # unbundling: (run 'hg heads' to see heads) |
|
1296 | # unbundling: (run 'hg heads' to see heads) | |
| 1297 |
|
1297 | |||
| 1298 | changeset pruned on its own |
|
1298 | changeset pruned on its own | |
| 1299 | =========================== |
|
1299 | =========================== | |
| 1300 |
|
1300 | |||
| 1301 | . ⊗ B |
|
1301 | . ⊗ B | |
| 1302 | . | |
|
1302 | . | | |
| 1303 | . ◕ A |
|
1303 | . ◕ A | |
| 1304 | . | |
|
1304 | . | | |
| 1305 | . ● |
|
1305 | . ● | |
| 1306 |
|
1306 | |||
| 1307 | setup |
|
1307 | setup | |
| 1308 | ----- |
|
1308 | ----- | |
| 1309 |
|
1309 | |||
| 1310 | $ mktestrepo lonely-prune |
|
1310 | $ mktestrepo lonely-prune | |
| 1311 | $ hg up 'desc("ROOT")' |
|
1311 | $ hg up 'desc("ROOT")' | |
| 1312 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1312 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 1313 | $ mkcommit 'C-A' |
|
1313 | $ mkcommit 'C-A' | |
| 1314 | $ mkcommit 'C-B' |
|
1314 | $ mkcommit 'C-B' | |
| 1315 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` |
|
1315 | $ hg debugobsolete --record-parent `getid 'desc("C-B")'` | |
| 1316 | obsoleted 1 changesets |
|
1316 | obsoleted 1 changesets | |
| 1317 |
|
1317 | |||
| 1318 | $ hg up 'desc("ROOT")' |
|
1318 | $ hg up 'desc("ROOT")' | |
| 1319 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1319 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 1320 | $ hg log --hidden -G |
|
1320 | $ hg log --hidden -G | |
| 1321 | x cefb651fc2fd: C-B |
|
1321 | x cefb651fc2fd: C-B | |
| 1322 | | |
|
1322 | | | |
| 1323 | o 9ac430e15fca: C-A |
|
1323 | o 9ac430e15fca: C-A | |
| 1324 | | |
|
1324 | | | |
| 1325 | @ ea207398892e: ROOT |
|
1325 | @ ea207398892e: ROOT | |
| 1326 |
|
1326 | |||
| 1327 | $ hg debugobsolete |
|
1327 | $ hg debugobsolete | |
| 1328 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1328 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1329 |
|
1329 | |||
| 1330 | Actual testing |
|
1330 | Actual testing | |
| 1331 | -------------- |
|
1331 | -------------- | |
| 1332 | $ testrevs 'desc("C-A")' |
|
1332 | $ testrevs 'desc("C-A")' | |
| 1333 | ### Matched revisions### |
|
1333 | ### Matched revisions### | |
| 1334 | 9ac430e15fca: C-A |
|
1334 | 9ac430e15fca: C-A | |
| 1335 | ### Relevant markers ### |
|
1335 | ### Relevant markers ### | |
| 1336 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1336 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1337 | # bundling: 1 changesets found |
|
1337 | # bundling: 1 changesets found | |
| 1338 | ### Bundled markers ### |
|
1338 | ### Bundled markers ### | |
| 1339 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1339 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1340 | ### diff <relevant> <bundled> ### |
|
1340 | ### diff <relevant> <bundled> ### | |
| 1341 | ################################# |
|
1341 | ################################# | |
| 1342 | ### Exclusive markers ### |
|
1342 | ### Exclusive markers ### | |
| 1343 | $ testrevs 'desc("C-B")' |
|
1343 | $ testrevs 'desc("C-B")' | |
| 1344 | ### Matched revisions### |
|
1344 | ### Matched revisions### | |
| 1345 | cefb651fc2fd: C-B |
|
1345 | cefb651fc2fd: C-B | |
| 1346 | ### Relevant markers ### |
|
1346 | ### Relevant markers ### | |
| 1347 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1347 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1348 | # bundling: 1 changesets found |
|
1348 | # bundling: 1 changesets found | |
| 1349 | ### Bundled markers ### |
|
1349 | ### Bundled markers ### | |
| 1350 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1350 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1351 | ### diff <relevant> <bundled> ### |
|
1351 | ### diff <relevant> <bundled> ### | |
| 1352 | ################################# |
|
1352 | ################################# | |
| 1353 | ### Exclusive markers ### |
|
1353 | ### Exclusive markers ### | |
| 1354 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1354 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1355 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg (glob) |
|
1355 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg (glob) | |
| 1356 | ### Backup markers ### |
|
1356 | ### Backup markers ### | |
| 1357 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1357 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1358 | ### diff <relevant> <backed-up> ### |
|
1358 | ### diff <relevant> <backed-up> ### | |
| 1359 | ################################# |
|
1359 | ################################# | |
| 1360 | ### Stripped markers ### |
|
1360 | ### Stripped markers ### | |
| 1361 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1361 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1362 | ### diff <exclusive> <stripped> ### |
|
1362 | ### diff <exclusive> <stripped> ### | |
| 1363 | ################################# |
|
1363 | ################################# | |
| 1364 | # unbundling: adding changesets |
|
1364 | # unbundling: adding changesets | |
| 1365 | # unbundling: adding manifests |
|
1365 | # unbundling: adding manifests | |
| 1366 | # unbundling: adding file changes |
|
1366 | # unbundling: adding file changes | |
| 1367 | # unbundling: added 1 changesets with 1 changes to 1 files |
|
1367 | # unbundling: added 1 changesets with 1 changes to 1 files | |
| 1368 | # unbundling: 1 new obsolescence markers |
|
1368 | # unbundling: 1 new obsolescence markers | |
| 1369 | # unbundling: (run 'hg update' to get a working copy) |
|
1369 | # unbundling: (run 'hg update' to get a working copy) | |
| 1370 | $ testrevs 'desc("C-")' |
|
1370 | $ testrevs 'desc("C-")' | |
| 1371 | ### Matched revisions### |
|
1371 | ### Matched revisions### | |
| 1372 | 9ac430e15fca: C-A |
|
1372 | 9ac430e15fca: C-A | |
| 1373 | cefb651fc2fd: C-B |
|
1373 | cefb651fc2fd: C-B | |
| 1374 | ### Relevant markers ### |
|
1374 | ### Relevant markers ### | |
| 1375 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1375 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1376 | # bundling: 2 changesets found |
|
1376 | # bundling: 2 changesets found | |
| 1377 | ### Bundled markers ### |
|
1377 | ### Bundled markers ### | |
| 1378 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1378 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1379 | ### diff <relevant> <bundled> ### |
|
1379 | ### diff <relevant> <bundled> ### | |
| 1380 | ################################# |
|
1380 | ################################# | |
| 1381 | ### Exclusive markers ### |
|
1381 | ### Exclusive markers ### | |
| 1382 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1382 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1383 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg (glob) |
|
1383 | # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg (glob) | |
| 1384 | ### Backup markers ### |
|
1384 | ### Backup markers ### | |
| 1385 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1385 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1386 | ### diff <relevant> <backed-up> ### |
|
1386 | ### diff <relevant> <backed-up> ### | |
| 1387 | ################################# |
|
1387 | ################################# | |
| 1388 | ### Stripped markers ### |
|
1388 | ### Stripped markers ### | |
| 1389 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1389 | cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 1390 | ### diff <exclusive> <stripped> ### |
|
1390 | ### diff <exclusive> <stripped> ### | |
| 1391 | ################################# |
|
1391 | ################################# | |
| 1392 | # unbundling: adding changesets |
|
1392 | # unbundling: adding changesets | |
| 1393 | # unbundling: adding manifests |
|
1393 | # unbundling: adding manifests | |
| 1394 | # unbundling: adding file changes |
|
1394 | # unbundling: adding file changes | |
| 1395 | # unbundling: added 2 changesets with 2 changes to 2 files |
|
1395 | # unbundling: added 2 changesets with 2 changes to 2 files | |
| 1396 | # unbundling: 1 new obsolescence markers |
|
1396 | # unbundling: 1 new obsolescence markers | |
| 1397 | # unbundling: new changesets 9ac430e15fca |
|
1397 | # unbundling: new changesets 9ac430e15fca | |
| 1398 | # unbundling: (run 'hg update' to get a working copy) |
|
1398 | # unbundling: (run 'hg update' to get a working copy) | |
| @@ -1,175 +1,175 | |||||
| 1 | Test changesets filtering during exchanges (some tests are still in |
|
1 | Test changesets filtering during exchanges (some tests are still in | |
| 2 | test-obsolete.t) |
|
2 | test-obsolete.t) | |
| 3 |
|
3 | |||
| 4 | $ cat >> $HGRCPATH << EOF |
|
4 | $ cat >> $HGRCPATH << EOF | |
| 5 | > [experimental] |
|
5 | > [experimental] | |
| 6 | > evolution.createmarkers=True |
|
6 | > evolution.createmarkers=True | |
| 7 | > EOF |
|
7 | > EOF | |
| 8 |
|
8 | |||
| 9 | Push does not corrupt remote |
|
9 | Push does not corrupt remote | |
| 10 | ---------------------------- |
|
10 | ---------------------------- | |
| 11 |
|
11 | |||
| 12 | Create a DAG where a changeset reuses a revision from a file first used in an |
|
12 | Create a DAG where a changeset reuses a revision from a file first used in an | |
| 13 | extinct changeset. |
|
13 | extinct changeset. | |
| 14 |
|
14 | |||
| 15 | $ hg init local |
|
15 | $ hg init local | |
| 16 | $ cd local |
|
16 | $ cd local | |
| 17 | $ echo 'base' > base |
|
17 | $ echo 'base' > base | |
| 18 | $ hg commit -Am base |
|
18 | $ hg commit -Am base | |
| 19 | adding base |
|
19 | adding base | |
| 20 | $ echo 'A' > A |
|
20 | $ echo 'A' > A | |
| 21 | $ hg commit -Am A |
|
21 | $ hg commit -Am A | |
| 22 | adding A |
|
22 | adding A | |
| 23 | $ hg up 0 |
|
23 | $ hg up 0 | |
| 24 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
24 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 25 | $ hg revert -ar 1 |
|
25 | $ hg revert -ar 1 | |
| 26 | adding A |
|
26 | adding A | |
| 27 | $ hg commit -Am "A'" |
|
27 | $ hg commit -Am "A'" | |
| 28 | created new head |
|
28 | created new head | |
| 29 | $ hg log -G --template='{desc} {node}' |
|
29 | $ hg log -G --template='{desc} {node}' | |
| 30 | @ A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
|
30 | @ A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee | |
| 31 | | |
|
31 | | | |
| 32 | | o A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a |
|
32 | | o A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a | |
| 33 | |/ |
|
33 | |/ | |
| 34 | o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3 |
|
34 | o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3 | |
| 35 |
|
35 | |||
| 36 | $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
|
36 | $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee | |
| 37 | obsoleted 1 changesets |
|
37 | obsoleted 1 changesets | |
| 38 |
|
38 | |||
| 39 | Push it. The bundle should not refer to the extinct changeset. |
|
39 | Push it. The bundle should not refer to the extinct changeset. | |
| 40 |
|
40 | |||
| 41 | $ hg init ../other |
|
41 | $ hg init ../other | |
| 42 | $ hg push ../other |
|
42 | $ hg push ../other | |
| 43 | pushing to ../other |
|
43 | pushing to ../other | |
| 44 | searching for changes |
|
44 | searching for changes | |
| 45 | adding changesets |
|
45 | adding changesets | |
| 46 | adding manifests |
|
46 | adding manifests | |
| 47 | adding file changes |
|
47 | adding file changes | |
| 48 | added 2 changesets with 2 changes to 2 files |
|
48 | added 2 changesets with 2 changes to 2 files | |
| 49 | $ hg -R ../other verify |
|
49 | $ hg -R ../other verify | |
| 50 | checking changesets |
|
50 | checking changesets | |
| 51 | checking manifests |
|
51 | checking manifests | |
| 52 | crosschecking files in changesets and manifests |
|
52 | crosschecking files in changesets and manifests | |
| 53 | checking files |
|
53 | checking files | |
| 54 | 2 files, 2 changesets, 2 total revisions |
|
54 | 2 files, 2 changesets, 2 total revisions | |
| 55 |
|
55 | |||
| 56 | Adding a changeset going extinct locally |
|
56 | Adding a changeset going extinct locally | |
| 57 | ------------------------------------------ |
|
57 | ------------------------------------------ | |
| 58 |
|
58 | |||
| 59 | Pull a changeset that will immediatly goes extinct (because you already have a |
|
59 | Pull a changeset that will immediatly goes extinct (because you already have a | |
| 60 | marker to obsolete him) |
|
60 | marker to obsolete him) | |
| 61 | (test resolution of issue3788) |
|
61 | (test resolution of issue3788) | |
| 62 |
|
62 | |||
| 63 | $ hg phase --draft --force f89bcc95eba5 |
|
63 | $ hg phase --draft --force f89bcc95eba5 | |
| 64 | $ hg phase -R ../other --draft --force f89bcc95eba5 |
|
64 | $ hg phase -R ../other --draft --force f89bcc95eba5 | |
| 65 | $ hg commit --amend -m "A''" |
|
65 | $ hg commit --amend -m "A''" | |
| 66 | $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 |
|
66 | $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 | |
| 67 | $ hg pull ../other |
|
67 | $ hg pull ../other | |
| 68 | pulling from ../other |
|
68 | pulling from ../other | |
| 69 | searching for changes |
|
69 | searching for changes | |
| 70 | adding changesets |
|
70 | adding changesets | |
| 71 | adding manifests |
|
71 | adding manifests | |
| 72 | adding file changes |
|
72 | adding file changes | |
| 73 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
73 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
| 74 | new changesets f89bcc95eba5 |
|
74 | new changesets f89bcc95eba5 | |
| 75 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
75 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 76 |
|
76 | |||
| 77 | check that bundle is not affected |
|
77 | check that bundle is not affected | |
| 78 |
|
78 | |||
| 79 | $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg |
|
79 | $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5.hg | |
| 80 | 1 changesets found |
|
80 | 1 changesets found | |
| 81 | $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 |
|
81 | $ hg --hidden --config extensions.mq= strip --no-backup f89bcc95eba5 | |
| 82 | $ hg unbundle ../f89bcc95eba5.hg |
|
82 | $ hg unbundle ../f89bcc95eba5.hg | |
| 83 | adding changesets |
|
83 | adding changesets | |
| 84 | adding manifests |
|
84 | adding manifests | |
| 85 | adding file changes |
|
85 | adding file changes | |
| 86 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
86 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
| 87 | (run 'hg heads' to see heads) |
|
87 | (run 'hg heads' to see heads) | |
| 88 |
|
88 | |||
| 89 | check-that bundle can contain markers: |
|
89 | check-that bundle can contain markers: | |
| 90 |
|
90 | |||
| 91 |
$ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental. |
|
91 | $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.evolution.bundle-obsmarker=1 | |
| 92 | 1 changesets found |
|
92 | 1 changesets found | |
| 93 | $ hg debugbundle ../f89bcc95eba5.hg |
|
93 | $ hg debugbundle ../f89bcc95eba5.hg | |
| 94 | Stream params: {Compression: BZ} |
|
94 | Stream params: {Compression: BZ} | |
| 95 | changegroup -- {nbchanges: 1, version: 02} |
|
95 | changegroup -- {nbchanges: 1, version: 02} | |
| 96 | f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
|
96 | f89bcc95eba5174b1ccc3e33a82e84c96e8338ee | |
| 97 | $ hg debugbundle ../f89bcc95eba5-obs.hg |
|
97 | $ hg debugbundle ../f89bcc95eba5-obs.hg | |
| 98 | Stream params: {Compression: BZ} |
|
98 | Stream params: {Compression: BZ} | |
| 99 | changegroup -- {nbchanges: 1, version: 02} |
|
99 | changegroup -- {nbchanges: 1, version: 02} | |
| 100 | f89bcc95eba5174b1ccc3e33a82e84c96e8338ee |
|
100 | f89bcc95eba5174b1ccc3e33a82e84c96e8338ee | |
| 101 | obsmarkers -- {} |
|
101 | obsmarkers -- {} | |
| 102 | version: 1 (70 bytes) |
|
102 | version: 1 (70 bytes) | |
| 103 | 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
103 | 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
| 104 |
|
104 | |||
| 105 | $ cd .. |
|
105 | $ cd .. | |
| 106 |
|
106 | |||
| 107 | pull does not fetch excessive changesets when common node is hidden (issue4982) |
|
107 | pull does not fetch excessive changesets when common node is hidden (issue4982) | |
| 108 | ------------------------------------------------------------------------------- |
|
108 | ------------------------------------------------------------------------------- | |
| 109 |
|
109 | |||
| 110 | initial repo with server and client matching |
|
110 | initial repo with server and client matching | |
| 111 |
|
111 | |||
| 112 | $ hg init pull-hidden-common |
|
112 | $ hg init pull-hidden-common | |
| 113 | $ cd pull-hidden-common |
|
113 | $ cd pull-hidden-common | |
| 114 | $ touch foo |
|
114 | $ touch foo | |
| 115 | $ hg -q commit -A -m initial |
|
115 | $ hg -q commit -A -m initial | |
| 116 | $ echo 1 > foo |
|
116 | $ echo 1 > foo | |
| 117 | $ hg commit -m 1 |
|
117 | $ hg commit -m 1 | |
| 118 | $ echo 2a > foo |
|
118 | $ echo 2a > foo | |
| 119 | $ hg commit -m 2a |
|
119 | $ hg commit -m 2a | |
| 120 | $ cd .. |
|
120 | $ cd .. | |
| 121 | $ hg clone --pull pull-hidden-common pull-hidden-common-client |
|
121 | $ hg clone --pull pull-hidden-common pull-hidden-common-client | |
| 122 | requesting all changes |
|
122 | requesting all changes | |
| 123 | adding changesets |
|
123 | adding changesets | |
| 124 | adding manifests |
|
124 | adding manifests | |
| 125 | adding file changes |
|
125 | adding file changes | |
| 126 | added 3 changesets with 3 changes to 1 files |
|
126 | added 3 changesets with 3 changes to 1 files | |
| 127 | new changesets 96ee1d7354c4:6a29ed9c68de |
|
127 | new changesets 96ee1d7354c4:6a29ed9c68de | |
| 128 | updating to branch default |
|
128 | updating to branch default | |
| 129 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
129 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 130 |
|
130 | |||
| 131 | server obsoletes the old head |
|
131 | server obsoletes the old head | |
| 132 |
|
132 | |||
| 133 | $ cd pull-hidden-common |
|
133 | $ cd pull-hidden-common | |
| 134 | $ hg -q up -r 1 |
|
134 | $ hg -q up -r 1 | |
| 135 | $ echo 2b > foo |
|
135 | $ echo 2b > foo | |
| 136 | $ hg -q commit -m 2b |
|
136 | $ hg -q commit -m 2b | |
| 137 | $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129 |
|
137 | $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129 | |
| 138 | obsoleted 1 changesets |
|
138 | obsoleted 1 changesets | |
| 139 | $ cd .. |
|
139 | $ cd .. | |
| 140 |
|
140 | |||
| 141 | client only pulls down 1 changeset |
|
141 | client only pulls down 1 changeset | |
| 142 |
|
142 | |||
| 143 | $ cd pull-hidden-common-client |
|
143 | $ cd pull-hidden-common-client | |
| 144 | $ hg pull --debug |
|
144 | $ hg pull --debug | |
| 145 | pulling from $TESTTMP/pull-hidden-common (glob) |
|
145 | pulling from $TESTTMP/pull-hidden-common (glob) | |
| 146 | query 1; heads |
|
146 | query 1; heads | |
| 147 | searching for changes |
|
147 | searching for changes | |
| 148 | taking quick initial sample |
|
148 | taking quick initial sample | |
| 149 | query 2; still undecided: 2, sample size is: 2 |
|
149 | query 2; still undecided: 2, sample size is: 2 | |
| 150 | 2 total queries in *.????s (glob) |
|
150 | 2 total queries in *.????s (glob) | |
| 151 | 1 changesets found |
|
151 | 1 changesets found | |
| 152 | list of changesets: |
|
152 | list of changesets: | |
| 153 | bec0734cd68e84477ba7fc1d13e6cff53ab70129 |
|
153 | bec0734cd68e84477ba7fc1d13e6cff53ab70129 | |
| 154 | listing keys for "bookmarks" |
|
154 | listing keys for "bookmarks" | |
| 155 | bundle2-output-bundle: "HG20", 3 parts total |
|
155 | bundle2-output-bundle: "HG20", 3 parts total | |
| 156 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
|
156 | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload | |
| 157 | bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload |
|
157 | bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload | |
| 158 | bundle2-output-part: "phase-heads" 24 bytes payload |
|
158 | bundle2-output-part: "phase-heads" 24 bytes payload | |
| 159 | bundle2-input-bundle: with-transaction |
|
159 | bundle2-input-bundle: with-transaction | |
| 160 | bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported |
|
160 | bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported | |
| 161 | adding changesets |
|
161 | adding changesets | |
| 162 | add changeset bec0734cd68e |
|
162 | add changeset bec0734cd68e | |
| 163 | adding manifests |
|
163 | adding manifests | |
| 164 | adding file changes |
|
164 | adding file changes | |
| 165 | adding foo revisions |
|
165 | adding foo revisions | |
| 166 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
166 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 167 | bundle2-input-part: total payload size 476 |
|
167 | bundle2-input-part: total payload size 476 | |
| 168 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
168 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
| 169 | bundle2-input-part: "phase-heads" supported |
|
169 | bundle2-input-part: "phase-heads" supported | |
| 170 | bundle2-input-part: total payload size 24 |
|
170 | bundle2-input-part: total payload size 24 | |
| 171 | bundle2-input-bundle: 2 parts total |
|
171 | bundle2-input-bundle: 2 parts total | |
| 172 | checking for updated bookmarks |
|
172 | checking for updated bookmarks | |
| 173 | new changesets bec0734cd68e |
|
173 | new changesets bec0734cd68e | |
| 174 | updating the branch cache |
|
174 | updating the branch cache | |
| 175 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
175 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
General Comments 0
You need to be logged in to leave comments.
Login now