Show More
@@ -1918,6 +1918,7 b' class localrepository(object):' | |||||
1918 | mso = _("push includes obsolete changeset: %s!") |
|
1918 | mso = _("push includes obsolete changeset: %s!") | |
1919 | msu = _("push includes unstable changeset: %s!") |
|
1919 | msu = _("push includes unstable changeset: %s!") | |
1920 | msb = _("push includes bumped changeset: %s!") |
|
1920 | msb = _("push includes bumped changeset: %s!") | |
|
1921 | msd = _("push includes divergent changeset: %s!") | |||
1921 | # If we are to push if there is at least one |
|
1922 | # If we are to push if there is at least one | |
1922 | # obsolete or unstable changeset in missing, at |
|
1923 | # obsolete or unstable changeset in missing, at | |
1923 | # least one of the missinghead will be obsolete or |
|
1924 | # least one of the missinghead will be obsolete or | |
@@ -1930,6 +1931,8 b' class localrepository(object):' | |||||
1930 | raise util.Abort(msu % ctx) |
|
1931 | raise util.Abort(msu % ctx) | |
1931 | elif ctx.bumped(): |
|
1932 | elif ctx.bumped(): | |
1932 | raise util.Abort(msb % ctx) |
|
1933 | raise util.Abort(msb % ctx) | |
|
1934 | elif ctx.divergent(): | |||
|
1935 | raise util.Abort(msd % ctx) | |||
1933 | discovery.checkheads(unfi, remote, outgoing, |
|
1936 | discovery.checkheads(unfi, remote, outgoing, | |
1934 | remoteheads, newbranch, |
|
1937 | remoteheads, newbranch, | |
1935 | bool(inc)) |
|
1938 | bool(inc)) |
@@ -84,6 +84,16 b' A_1 have two direct and divergent succes' | |||||
84 | $ hg log -r 'divergent()' |
|
84 | $ hg log -r 'divergent()' | |
85 | 2:82623d38b9ba A_1 |
|
85 | 2:82623d38b9ba A_1 | |
86 | 3:392fd25390da A_2 |
|
86 | 3:392fd25390da A_2 | |
|
87 | ||||
|
88 | check that mercurial refuse to push | |||
|
89 | ||||
|
90 | $ hg init ../other | |||
|
91 | $ hg push ../other | |||
|
92 | pushing to ../other | |||
|
93 | searching for changes | |||
|
94 | abort: push includes divergent changeset: 82623d38b9ba! | |||
|
95 | [255] | |||
|
96 | ||||
87 | $ cd .. |
|
97 | $ cd .. | |
88 |
|
98 | |||
89 |
|
99 |
General Comments 0
You need to be logged in to leave comments.
Login now