Mercurial > hg
comparison tests/test-rebase-newancestor.t @ 40865:4edd427f34c1
rebase: clarify that commits that become empty are skipped
Our message just said that it created no changes, but we didn't
explicitly say that that meant that the the commit was not rebased. It
also wasn't clear why it created no changes, so this patch also
clarifies that that was because the changes were already in the
destination.
Differential Revision: https://phab.mercurial-scm.org/D5395
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 07 Dec 2018 14:23:17 -0800 |
parents | 09680349cc2d |
children | 4764e8436b2a |
comparison
equal
deleted
inserted
replaced
40864:09680349cc2d | 40865:4edd427f34c1 |
---|---|
128 | 128 |
129 $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF | 129 $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF |
130 > c | 130 > c |
131 > EOF | 131 > EOF |
132 rebasing 1:1d1a643d390e "dev: create branch" | 132 rebasing 1:1d1a643d390e "dev: create branch" |
133 note: rebase of 1:1d1a643d390e "dev: create branch" created no changes to commit | 133 note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes |
134 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | 134 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
135 rebasing 4:4b019212aaf6 "dev: merge default" | 135 rebasing 4:4b019212aaf6 "dev: merge default" |
136 file 'f-default' was deleted in local [dest] but was modified in other [source]. | 136 file 'f-default' was deleted in local [dest] but was modified in other [source]. |
137 What do you want to do? | 137 What do you want to do? |
138 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c | 138 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |