<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">On 07/16/2015 01:44 PM, Moreno Javier
wrote:<br>
</div>
<blockquote
cite="mid:D024A528C91A56499D4BA7EFD282403B577212@ATBRAGMSX02.itiso.net"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
<meta name="Generator" content="Microsoft Word 14 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
<div class="WordSection1">
<p class="MsoNormal"><span lang="EN-US">Hi everybody,<o:p></o:p></span></p>
<p class="MsoNormal"><span lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span lang="EN-US">Currently, in my
department, we are thinking about changing our mercurial
source code manager. I’ve been toying around with few and I
find Kallithea an interesting option. However, would like to
be able to merge pull request in the server (In a similar
way of how RhodeCode does it in the last version). I know
that so far that is not possible with Kallithea and that a
manual merge is required. My question is: Are there any
plans of implementing such functionality? If so, do you have
any estimations about when? (short/mid/long term)</span></p>
</div>
</blockquote>
<br>
We have heard (and given) the request before, but so far nobody have
invested in implementing it. I would like to see it in Kallithea ...
but probably in a way where it is optional.<br>
<br>
Server side merge functionality might be convenient but can also be
considered harmful. It encourages a workflow where dirty history is
merged ... and where the merges make the history even more dirty.
Some people like that - I don't. I prefer to have a linear history -
that is why we for Kallithea rebase (and polish) contributed patches
before applying them. We would not use a "merge button" if we had
one. At work we do merge and get dirty history, but the actual merge
is just a small part of what is checked and done when merging to our
mainline so doing it locally is no significant overhead and gives
better insight into what actually is merged.<br>
<br>
RhodeCode is not open source and presumably violating the GPL so we
can't know what they are doing.<br>
<br>
/Mads<br>
</body>
</html>