Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 19861:a69a77a80900
rebase: preserve metadata from grafts of changes (issue4001)
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 01 Oct 2013 14:48:53 -0400 |
parents | 37100f30590f |
children | c23c62209cc4 |
comparison
equal
deleted
inserted
replaced
19860:6cd9b8428104 | 19861:a69a77a80900 |
---|---|
176 $ hg rebase --rev 'desc(D)' --dest 'desc(H)' | 176 $ hg rebase --rev 'desc(D)' --dest 'desc(H)' |
177 $ hg debugobsolete | 177 $ hg debugobsolete |
178 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {'date': '*', 'user': 'test'} (glob) | 178 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {'date': '*', 'user': 'test'} (glob) |
179 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 {'date': '*', 'user': 'test'} (glob) | 179 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 {'date': '*', 'user': 'test'} (glob) |
180 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {'date': '*', 'user': 'test'} (glob) | 180 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {'date': '*', 'user': 'test'} (glob) |
181 08483444fef91d6224f6655ee586a65d263ad34c cbc07f26687521cecfc9a141bf5ecfc0fd2b8531 0 {'date': '* *', 'user': 'test'} (glob) | 181 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 {'date': '* *', 'user': 'test'} (glob) |
182 $ hg log -G | 182 $ hg log -G |
183 @ 11:cbc07f266875 D | 183 @ 11:4596109a6a43 D |
184 | | 184 | |
185 | o 10:5ae4c968c6ac C | 185 | o 10:5ae4c968c6ac C |
186 | | | 186 | | |
187 | x 9:08483444fef9 D | 187 | x 9:08483444fef9 D |
188 | | | 188 | | |
201 $ hg rebase --source 'desc(B)' --dest 'tip' | 201 $ hg rebase --source 'desc(B)' --dest 'tip' |
202 $ hg debugobsolete | 202 $ hg debugobsolete |
203 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {'date': '* *', 'user': 'test'} (glob) | 203 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {'date': '* *', 'user': 'test'} (glob) |
204 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 {'date': '* *', 'user': 'test'} (glob) | 204 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 {'date': '* *', 'user': 'test'} (glob) |
205 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {'date': '* *', 'user': 'test'} (glob) | 205 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {'date': '* *', 'user': 'test'} (glob) |
206 08483444fef91d6224f6655ee586a65d263ad34c cbc07f26687521cecfc9a141bf5ecfc0fd2b8531 0 {'date': '* *', 'user': 'test'} (glob) | 206 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 {'date': '* *', 'user': 'test'} (glob) |
207 8877864f1edb05d0e07dc4ba77b67a80a7b86672 b1861c79d66ec3aa1b607ac3c9fb819e38b12238 0 {'date': '* *', 'user': 'test'} (glob) | 207 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 {'date': '* *', 'user': 'test'} (glob) |
208 08483444fef91d6224f6655ee586a65d263ad34c 0 {'date': '* *', 'user': 'test'} (glob) | 208 08483444fef91d6224f6655ee586a65d263ad34c 0 {'date': '* *', 'user': 'test'} (glob) |
209 5ae4c968c6aca831df823664e706c9d4aa34473d dd4be135457a404ce5541de427ae1d98a28f4acd 0 {'date': '* *', 'user': 'test'} (glob) | 209 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 {'date': '* *', 'user': 'test'} (glob) |
210 $ hg log --rev 'divergent()' | 210 $ hg log --rev 'divergent()' |
211 $ hg log -G | 211 $ hg log -G |
212 @ 13:dd4be135457a C | 212 @ 13:98f6af4ee953 C |
213 | | 213 | |
214 o 12:b1861c79d66e B | 214 o 12:462a34d07e59 B |
215 | | 215 | |
216 o 11:cbc07f266875 D | 216 o 11:4596109a6a43 D |
217 | | 217 | |
218 o 7:02de42196ebe H | 218 o 7:02de42196ebe H |
219 | | 219 | |
220 | o 6:eea13746799a G | 220 | o 6:eea13746799a G |
221 |/| | 221 |/| |
223 | | | 223 | | |
224 | o 4:9520eea781bc E | 224 | o 4:9520eea781bc E |
225 |/ | 225 |/ |
226 o 0:cd010b8cd998 A | 226 o 0:cd010b8cd998 A |
227 | 227 |
228 | 228 $ hg log --style default --debug -r 4596109a6a4328c398bde3a4a3b6737cfade3003 |
229 changeset: 11:4596109a6a4328c398bde3a4a3b6737cfade3003 | |
230 phase: draft | |
231 parent: 7:02de42196ebee42ef284b6780a87cdc96e8eaab6 | |
232 parent: -1:0000000000000000000000000000000000000000 | |
233 manifest: 11:a91006e3a02f1edf631f7018e6e5684cf27dd905 | |
234 user: Nicolas Dumazet <nicdumz.commits@gmail.com> | |
235 date: Sat Apr 30 15:24:48 2011 +0200 | |
236 files+: D | |
237 extra: branch=default | |
238 extra: rebase_source=08483444fef91d6224f6655ee586a65d263ad34c | |
239 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a | |
240 description: | |
241 D | |
242 | |
243 | |
229 $ cd .. | 244 $ cd .. |
230 | 245 |
231 collapse rebase | 246 collapse rebase |
232 --------------------------------- | 247 --------------------------------- |
233 | 248 |