Show More
@@ -128,7 +128,9 b' wrong.' | |||||
128 |
|
128 | |||
129 | Full rebase all the way back from branching point: |
|
129 | Full rebase all the way back from branching point: | |
130 |
|
130 | |||
131 | $ hg rebase -r 'only(dev,default)' -d default |
|
131 | $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF | |
|
132 | > c | |||
|
133 | > EOF | |||
132 | rebasing 1:1d1a643d390e "dev: create branch" |
|
134 | rebasing 1:1d1a643d390e "dev: create branch" | |
133 | note: rebase of 1:1d1a643d390e created no changes to commit |
|
135 | note: rebase of 1:1d1a643d390e created no changes to commit | |
134 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
|
136 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | |
@@ -157,7 +159,9 b' Grafty cherry picking rebasing:' | |||||
157 | $ cd ../ancestor-merge-2 |
|
159 | $ cd ../ancestor-merge-2 | |
158 |
|
160 | |||
159 | $ hg phase -fdr0: |
|
161 | $ hg phase -fdr0: | |
160 |
$ hg rebase -r 'children(only(dev,default |
|
162 | $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF | |
|
163 | > c | |||
|
164 | > EOF | |||
161 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
|
165 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | |
162 | rebasing 4:4b019212aaf6 "dev: merge default" |
|
166 | rebasing 4:4b019212aaf6 "dev: merge default" | |
163 | remote changed f-default which local deleted |
|
167 | remote changed f-default which local deleted |
General Comments 0
You need to be logged in to leave comments.
Login now