equal
deleted
inserted
replaced
83 3:392fd25390da A_2 |
83 3:392fd25390da A_2 |
84 |
84 |
85 check that mercurial refuse to push |
85 check that mercurial refuse to push |
86 |
86 |
87 $ hg init ../other |
87 $ hg init ../other |
|
88 $ hg log -r 'outgoing("../other") and divergent()' |
|
89 2:82623d38b9ba A_1 |
|
90 3:392fd25390da A_2 |
88 $ hg push ../other |
91 $ hg push ../other |
89 pushing to ../other |
92 pushing to ../other |
90 searching for changes |
93 searching for changes |
91 abort: push includes a divergent changeset: 82623d38b9ba! |
94 abort: push includes a divergent changeset: (82623d38b9ba|392fd25390da)! (re) |
92 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
95 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
93 [255] |
96 [255] |
94 |
97 |
95 $ cd .. |
98 $ cd .. |
96 |
99 |