Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 26821:27683c63f44c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: improve clarity of table in update docstring
author Augie Fackler <augie@google.com>
date Fri, 23 Oct 2015 06:06:22 -0400
parents 64848559413a
children ab798d1a230f 6a6e78f84cc6
comparison
equal deleted inserted replaced
26820:71d5238f92e9 26821:27683c63f44c
1114 the parent rev to the target rev (linear, on the same named 1114 the parent rev to the target rev (linear, on the same named
1115 branch, or on another named branch). 1115 branch, or on another named branch).
1116 1116
1117 This logic is tested by test-update-branches.t. 1117 This logic is tested by test-update-branches.t.
1118 1118
1119 -c -C dirty rev | linear same cross 1119 -c -C dirty rev | linear same cross
1120 n n n n | ok (1) x 1120 n n n n | ok (1) x
1121 n n n y | ok ok ok 1121 n n n y | ok ok ok
1122 n n y n | merge (2) (2) 1122 n n y n | merge (2) (2)
1123 n n y y | merge (3) (3) 1123 n n y y | merge (3) (3)
1124 n y * * | --- discard --- 1124 n y * * | discard discard discard
1125 y n y * | --- (4) --- 1125 y n y * | (4) (4) (4)
1126 y n n * | --- ok --- 1126 y n n * | ok ok ok
1127 y y * * | --- (5) --- 1127 y y * * | (5) (5) (5)
1128 1128
1129 x = can't happen 1129 x = can't happen
1130 * = don't-care 1130 * = don't-care
1131 1 = abort: not a linear update (merge or update --check to force update) 1131 1 = abort: not a linear update (merge or update --check to force update)
1132 2 = abort: uncommitted changes (commit and merge, or update --clean to 1132 2 = abort: uncommitted changes (commit and merge, or update --clean to