Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 27147:804abe8999f3
graft: copy extra (except branch) when copying changesets
author | Mike Edgar <adgar@google.com> |
---|---|
date | Sat, 28 Nov 2015 04:11:38 -0500 |
parents | 5eac7ab59b95 |
children | f9e755736b0e |
comparison
equal
deleted
inserted
replaced
27146:88fde8db5307 | 27147:804abe8999f3 |
---|---|
251 $ hg up -qr 'desc(G)' | 251 $ hg up -qr 'desc(G)' |
252 $ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003 | 252 $ hg graft 4596109a6a4328c398bde3a4a3b6737cfade3003 |
253 grafting 11:4596109a6a43 "D" | 253 grafting 11:4596109a6a43 "D" |
254 $ hg up -qr 'desc(E)' | 254 $ hg up -qr 'desc(E)' |
255 $ hg rebase -s tip -d . | 255 $ hg rebase -s tip -d . |
256 rebasing 14:9e36056a46e3 "D" (tip) | 256 rebasing 14:0f4c66d0b70f "D" (tip) |
257 $ hg log --style default --debug -r tip | 257 $ hg log --style default --debug -r tip |
258 changeset: 15:627d4614809036ba22b9e7cb31638ddc06ab99ab | 258 changeset: 15:884f358981b4d32069bb539e0e95d49a35eb81d0 |
259 tag: tip | 259 tag: tip |
260 phase: draft | 260 phase: draft |
261 parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba | 261 parent: 4:9520eea781bcca16c1e15acc0ba14335a0e8e5ba |
262 parent: -1:0000000000000000000000000000000000000000 | 262 parent: -1:0000000000000000000000000000000000000000 |
263 manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42 | 263 manifest: 15:648e8ede73ae3e497d093d3a4c8fcc2daa864f42 |
264 user: Nicolas Dumazet <nicdumz.commits@gmail.com> | 264 user: Nicolas Dumazet <nicdumz.commits@gmail.com> |
265 date: Sat Apr 30 15:24:48 2011 +0200 | 265 date: Sat Apr 30 15:24:48 2011 +0200 |
266 files+: D | 266 files+: D |
267 extra: branch=default | 267 extra: branch=default |
268 extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003 | 268 extra: intermediate-source=4596109a6a4328c398bde3a4a3b6737cfade3003 |
269 extra: rebase_source=9e36056a46e37c9776168c7375734eebc70e294f | 269 extra: rebase_source=0f4c66d0b70f8e1ce4aec01f8e95cf24ee923afa |
270 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a | 270 extra: source=32af7686d403cf45b5d95f2d70cebea587ac806a |
271 description: | 271 description: |
272 D | 272 D |
273 | 273 |
274 | 274 |