equal
deleted
inserted
replaced
133 > EOF |
133 > EOF |
134 rebasing 1:1d1a643d390e "dev: create branch" |
134 rebasing 1:1d1a643d390e "dev: create branch" |
135 note: rebase of 1:1d1a643d390e created no changes to commit |
135 note: rebase of 1:1d1a643d390e created no changes to commit |
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 remote [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-backup.hg (glob) |
142 $ hg tglog |
142 $ hg tglog |
143 o 6: 'dev: merge default' |
143 o 6: 'dev: merge default' |
162 $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF |
162 $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF |
163 > c |
163 > c |
164 > EOF |
164 > EOF |
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 remote [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-backup.hg (glob) |
171 $ hg tglog |
171 $ hg tglog |
172 o 7: 'dev: merge default' |
172 o 7: 'dev: merge default' |