51 | | |
60 | | |
52 o | 1:540395c44225@default(draft) changea |
61 o | 1:540395c44225@default(draft) changea |
53 |/ |
62 |/ |
54 o 0:07f494440405@default(draft) adda |
63 o 0:07f494440405@default(draft) adda |
55 |
64 |
56 $ hg debugsuccessors |
65 $ hg debugobsolete |
57 $ hg --config extensions.hgext.mq= strip tip |
66 $ hg --config extensions.hgext.mq= strip tip |
58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
67 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg |
68 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg |
60 $ hg rebase -d 1 -r 3 --detach |
69 $ hg rebase -d 1 -r 3 --detach |
61 $ glog |
70 $ glog |
68 o 0:07f494440405@default(draft) adda |
77 o 0:07f494440405@default(draft) adda |
69 |
78 |
70 $ glog --hidden |
79 $ glog --hidden |
71 @ 4:9c5494949763@default(draft) adde |
80 @ 4:9c5494949763@default(draft) adde |
72 | |
81 | |
73 | o 3:98e4a024635e@default(secret) adde |
82 | x 3:98e4a024635e@default(draft) adde |
74 | | |
83 | | |
75 | o 2:102a90ea7b4a@default(draft) addb |
84 | o 2:102a90ea7b4a@default(draft) addb |
76 | | |
85 | | |
77 o | 1:540395c44225@default(draft) changea |
86 o | 1:540395c44225@default(draft) changea |
78 |/ |
87 |/ |
79 o 0:07f494440405@default(draft) adda |
88 o 0:07f494440405@default(draft) adda |
80 |
89 |
81 $ hg debugsuccessors |
90 $ hg debugobsolete |
82 98e4a024635e 9c5494949763 |
91 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob) |
83 |
92 |
84 Test rebase with deleted empty revision |
93 Test rebase with deleted empty revision |
85 |
94 |
86 $ hg up 0 |
95 $ hg up 0 |
87 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
96 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
90 (branches are permanent and global, did you want a bookmark?) |
99 (branches are permanent and global, did you want a bookmark?) |
91 $ echo a >> a |
100 $ echo a >> a |
92 $ hg ci -m changea |
101 $ hg ci -m changea |
93 $ hg rebase -d 1 |
102 $ hg rebase -d 1 |
94 $ glog --hidden |
103 $ glog --hidden |
95 o 5:4e322f7ce8e3@foo(secret) changea |
104 x 5:4e322f7ce8e3@foo(draft) changea |
96 | |
105 | |
97 | o 4:9c5494949763@default(draft) adde |
106 | o 4:9c5494949763@default(draft) adde |
98 | | |
107 | | |
99 | | o 3:98e4a024635e@default(secret) adde |
108 | | x 3:98e4a024635e@default(draft) adde |
100 | | | |
109 | | | |
101 +---o 2:102a90ea7b4a@default(draft) addb |
110 +---o 2:102a90ea7b4a@default(draft) addb |
102 | | |
111 | | |
103 | @ 1:540395c44225@default(draft) changea |
112 | @ 1:540395c44225@default(draft) changea |
104 |/ |
113 |/ |
105 o 0:07f494440405@default(draft) adda |
114 o 0:07f494440405@default(draft) adda |
106 |
115 |
107 $ hg debugsuccessors |
116 $ hg debugobsolete |
108 4e322f7ce8e3 000000000000 |
117 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob) |
109 98e4a024635e 9c5494949763 |
118 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 540395c442253af3b991be882b539e7e198b5808 0 {'date': '* *', 'user': 'test'} (glob) |
110 |
119 |
111 Test rebase --collapse |
120 Test rebase --collapse |
112 |
121 |
113 $ hg up 0 |
122 $ hg up 0 |
114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
123 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
121 $ hg rebase --collapse -d 1 |
130 $ hg rebase --collapse -d 1 |
122 merging c |
131 merging c |
123 $ glog --hidden |
132 $ glog --hidden |
124 @ 8:a7773ffa7edc@default(draft) Collapsed revision |
133 @ 8:a7773ffa7edc@default(draft) Collapsed revision |
125 | |
134 | |
126 | o 7:03f31481307a@default(secret) changec |
135 | x 7:03f31481307a@default(draft) changec |
127 | | |
136 | | |
128 | o 6:076e9b2ffbe1@default(secret) addc |
137 | x 6:076e9b2ffbe1@default(draft) addc |
129 | | |
138 | | |
130 | | o 5:4e322f7ce8e3@foo(secret) changea |
139 | | x 5:4e322f7ce8e3@foo(draft) changea |
131 | |/ |
140 | |/ |
132 +---o 4:9c5494949763@default(draft) adde |
141 +---o 4:9c5494949763@default(draft) adde |
133 | | |
142 | | |
134 | | o 3:98e4a024635e@default(secret) adde |
143 | | x 3:98e4a024635e@default(draft) adde |
135 | | | |
144 | | | |
136 | | o 2:102a90ea7b4a@default(draft) addb |
145 | | o 2:102a90ea7b4a@default(draft) addb |
137 | |/ |
146 | |/ |
138 o | 1:540395c44225@default(draft) changea |
147 o | 1:540395c44225@default(draft) changea |
139 |/ |
148 |/ |
140 o 0:07f494440405@default(draft) adda |
149 o 0:07f494440405@default(draft) adda |
141 |
150 |
142 $ hg debugsuccessors |
151 $ hg debugobsolete |
143 03f31481307a a7773ffa7edc |
152 98e4a024635e8c50928144c9277a4388d26bd786 9c54949497631abfb5a255d96746bbd3a42ed2ba 0 {'date': '* *', 'user': 'test'} (glob) |
144 076e9b2ffbe1 a7773ffa7edc |
153 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 540395c442253af3b991be882b539e7e198b5808 0 {'date': '* *', 'user': 'test'} (glob) |
145 4e322f7ce8e3 000000000000 |
154 076e9b2ffbe11c7bcb9ee97f5c0c8b88a1a10b93 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob) |
146 98e4a024635e 9c5494949763 |
155 03f31481307aaf5275d07ec28c1c59931759ccd2 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob) |
147 |
156 |
148 Test rebase --abort |
157 Test rebase --abort |
149 |
158 |
150 $ hg debugsuccessors > ../successors.old |
159 $ hg debugobsolete > ../successors.old |
151 $ hg up 0 |
160 $ hg up 0 |
152 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
161 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
153 $ echo d > d |
162 $ echo d > d |
154 $ hg ci -Am addd d |
163 $ hg ci -Am addd d |
155 created new head |
164 created new head |
162 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
171 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) |
163 [255] |
172 [255] |
164 $ hg rebase --abort |
173 $ hg rebase --abort |
165 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg |
174 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg |
166 rebase aborted |
175 rebase aborted |
167 $ hg debugsuccessors > ../successors.new |
176 $ hg debugobsolete > ../successors.new |
168 $ diff -u ../successors.old ../successors.new |
177 $ diff -u ../successors.old ../successors.new |
169 |
178 |
170 Test rebase --continue |
179 Test rebase --continue |
171 |
180 |
172 $ hg rebase -d 1 |
181 $ hg rebase -d 1 |
180 $ glog --hidden |
189 $ glog --hidden |
181 @ 12:1951ead97108@default(draft) appendab |
190 @ 12:1951ead97108@default(draft) appendab |
182 | |
191 | |
183 o 11:03f165c84ea8@default(draft) addd |
192 o 11:03f165c84ea8@default(draft) addd |
184 | |
193 | |
185 | o 10:4b9d80f48523@default(secret) appendab |
194 | x 10:4b9d80f48523@default(draft) appendab |
186 | | |
195 | | |
187 | o 9:a31943eabc43@default(secret) addd |
196 | x 9:a31943eabc43@default(draft) addd |
188 | | |
197 | | |
189 +---o 8:a7773ffa7edc@default(draft) Collapsed revision |
198 +---o 8:a7773ffa7edc@default(draft) Collapsed revision |
190 | | |
199 | | |
191 | | o 7:03f31481307a@default(secret) changec |
200 | | x 7:03f31481307a@default(draft) changec |
192 | | | |
201 | | | |
193 | | o 6:076e9b2ffbe1@default(secret) addc |
202 | | x 6:076e9b2ffbe1@default(draft) addc |
194 | |/ |
203 | |/ |
195 | | o 5:4e322f7ce8e3@foo(secret) changea |
204 | | x 5:4e322f7ce8e3@foo(draft) changea |
196 | |/ |
205 | |/ |
197 +---o 4:9c5494949763@default(draft) adde |
206 +---o 4:9c5494949763@default(draft) adde |
198 | | |
207 | | |
199 | | o 3:98e4a024635e@default(secret) adde |
208 | | x 3:98e4a024635e@default(draft) adde |
200 | | | |
209 | | | |
201 | | o 2:102a90ea7b4a@default(draft) addb |
210 | | o 2:102a90ea7b4a@default(draft) addb |
202 | |/ |
211 | |/ |
203 o | 1:540395c44225@default(draft) changea |
212 o | 1:540395c44225@default(draft) changea |
204 |/ |
213 |/ |
205 o 0:07f494440405@default(draft) adda |
214 o 0:07f494440405@default(draft) adda |
206 |
215 |
207 $ hg debugsuccessors > ../successors.new |
216 $ hg debugobsolete > ../successors.new |
208 $ diff -u ../successors.old ../successors.new |
217 $ diff -u ../successors.old ../successors.new |
209 --- ../successors.old* (glob) |
218 --- ../successors.old* (glob) |
210 +++ ../successors.new* (glob) |
219 +++ ../successors.new* (glob) |
211 @@ -1,4 +1,6 @@ |
220 @@ -2,3 +2,5 @@ |
212 03f31481307a a7773ffa7edc |
221 4e322f7ce8e3e4203950eac9ece27bf7e45ffa6c 540395c442253af3b991be882b539e7e198b5808 0 {'date': '* *', 'user': 'test'} (glob) |
213 076e9b2ffbe1 a7773ffa7edc |
222 076e9b2ffbe11c7bcb9ee97f5c0c8b88a1a10b93 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob) |
214 +4b9d80f48523 1951ead97108 |
223 03f31481307aaf5275d07ec28c1c59931759ccd2 a7773ffa7edcfac27b5dcdb2d5c1036e15a49861 0 {'date': '* *', 'user': 'test'} (glob) |
215 4e322f7ce8e3 000000000000 |
224 +a31943eabc4327df16f9eca71bf7779c32f815f7 03f165c84ea8889fc35a64a392caa7a0084dd212 0 {'date': '* *', 'user': 'test'} (glob) |
216 98e4a024635e 9c5494949763 |
225 +4b9d80f48523e296f4402cc8e37236b768dfb981 1951ead9710803dbf117e95901954d5ed717f80b 0 {'date': '* *', 'user': 'test'} (glob) |
217 +a31943eabc43 03f165c84ea8 |
|
218 [1] |
226 [1] |