equal
deleted
inserted
replaced
42 $ hg rebase -s 1 -d 3 |
42 $ hg rebase -s 1 -d 3 |
43 rebasing 1:0f4f7cb4f549 "B" |
43 rebasing 1:0f4f7cb4f549 "B" |
44 merging a |
44 merging a |
45 rebasing 2:30ae917c0e4f "C" |
45 rebasing 2:30ae917c0e4f "C" |
46 merging a |
46 merging a |
47 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-backup.hg (glob) |
47 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-rebase.hg (glob) |
48 |
48 |
49 $ hg tglog |
49 $ hg tglog |
50 o 3: 'C' |
50 o 3: 'C' |
51 | |
51 | |
52 o 2: 'B' |
52 o 2: 'B' |
136 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
136 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
137 rebasing 4:4b019212aaf6 "dev: merge default" |
137 rebasing 4:4b019212aaf6 "dev: merge default" |
138 other [source] changed f-default which local [dest] deleted |
138 other [source] changed f-default which local [dest] deleted |
139 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
139 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
140 rebasing 6:9455ee510502 "dev: merge default" |
140 rebasing 6:9455ee510502 "dev: merge default" |
141 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-backup.hg (glob) |
141 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg (glob) |
142 $ hg tglog |
142 $ hg tglog |
143 o 6: 'dev: merge default' |
143 o 6: 'dev: merge default' |
144 | |
144 | |
145 o 5: 'dev: merge default' |
145 o 5: 'dev: merge default' |
146 | |
146 | |
165 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
165 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
166 rebasing 4:4b019212aaf6 "dev: merge default" |
166 rebasing 4:4b019212aaf6 "dev: merge default" |
167 other [source] changed f-default which local [dest] deleted |
167 other [source] changed f-default which local [dest] deleted |
168 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
168 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
169 rebasing 6:9455ee510502 "dev: merge default" |
169 rebasing 6:9455ee510502 "dev: merge default" |
170 saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-backup.hg (glob) |
170 saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg (glob) |
171 $ hg tglog |
171 $ hg tglog |
172 o 7: 'dev: merge default' |
172 o 7: 'dev: merge default' |
173 | |
173 | |
174 o 6: 'dev: merge default' |
174 o 6: 'dev: merge default' |
175 | |
175 | |
237 |/ |
237 |/ |
238 o 0: 'common' |
238 o 0: 'common' |
239 |
239 |
240 $ hg rebase -r 4 -d 2 |
240 $ hg rebase -r 4 -d 2 |
241 rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor" |
241 rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor" |
242 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-backup.hg (glob) |
242 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-rebase.hg (glob) |
243 $ hg tip |
243 $ hg tip |
244 changeset: 5:cca50676b1c5 |
244 changeset: 5:cca50676b1c5 |
245 tag: tip |
245 tag: tip |
246 parent: 2:a60552eb93fb |
246 parent: 2:a60552eb93fb |
247 parent: 3:f59da8fc0fcf |
247 parent: 3:f59da8fc0fcf |
249 date: Thu Jan 01 00:00:00 1970 +0000 |
249 date: Thu Jan 01 00:00:00 1970 +0000 |
250 summary: merge p1 3=outside p2 1=ancestor |
250 summary: merge p1 3=outside p2 1=ancestor |
251 |
251 |
252 $ hg rebase -r 4 -d 2 |
252 $ hg rebase -r 4 -d 2 |
253 rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside" |
253 rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside" |
254 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-backup.hg (glob) |
254 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-rebase.hg (glob) |
255 $ hg tip |
255 $ hg tip |
256 changeset: 5:f9daf77ffe76 |
256 changeset: 5:f9daf77ffe76 |
257 tag: tip |
257 tag: tip |
258 parent: 2:a60552eb93fb |
258 parent: 2:a60552eb93fb |
259 parent: 3:f59da8fc0fcf |
259 parent: 3:f59da8fc0fcf |
305 1 changesets found |
305 1 changesets found |
306 uncompressed size of bundle content: |
306 uncompressed size of bundle content: |
307 199 (changelog) |
307 199 (changelog) |
308 216 (manifests) |
308 216 (manifests) |
309 182 other |
309 182 other |
310 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-backup.hg (glob) |
310 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-rebase.hg (glob) |
311 1 changesets found |
311 1 changesets found |
312 uncompressed size of bundle content: |
312 uncompressed size of bundle content: |
313 254 (changelog) |
313 254 (changelog) |
314 167 (manifests) |
314 167 (manifests) |
315 182 other |
315 182 other |