Mercurial > hg
comparison tests/test-commit-amend.t @ 29775:978b907d9b36
merge: always use other, not remote, in user prompts
Now that we store and display merge labels in user prompts (not just
conflict markets), we should rely on labels to clarify the two sides of a
merge operation (hg merge, hg update, hg rebase etc).
"remote" is not a great name here, as it conflates "remote" as in "remote
server" with "remote" as in "the side of the merge that's further away". In
cases where you're merging the "wrong way" around, remote can even be the
"local" commit that you're merging with something pulled from the remote
server.
author | Simon Farnsworth <simonfar@fb.com> |
---|---|
date | Fri, 12 Aug 2016 05:56:40 -0700 |
parents | dae38633eba8 |
children | 940c05b25b07 |
comparison
equal
deleted
inserted
replaced
29774:a7f8939641aa | 29775:978b907d9b36 |
---|---|
811 $ echo aa >> aa | 811 $ echo aa >> aa |
812 $ hg ci -m aa | 812 $ hg ci -m aa |
813 $ hg merge -q bar --config ui.interactive=True << EOF | 813 $ hg merge -q bar --config ui.interactive=True << EOF |
814 > c | 814 > c |
815 > EOF | 815 > EOF |
816 local changed aa which remote deleted | 816 local changed aa which other deleted |
817 use (c)hanged version, (d)elete, or leave (u)nresolved? c | 817 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
818 $ hg ci -m 'merge bar (with conflicts)' | 818 $ hg ci -m 'merge bar (with conflicts)' |
819 $ hg log --config diff.git=1 -pr . | 819 $ hg log --config diff.git=1 -pr . |
820 changeset: 33:97a298b0c59f | 820 changeset: 33:97a298b0c59f |
821 tag: tip | 821 tag: tip |