<table cellspacing="0" cellpadding="0" border="0" ><tr><td valign="top" style="font: inherit;">I usually receive more than one patch a day. I can always use PULL for the first patch. After that I will have to do merge. It would be nice just to be able to PULL or MERGE with original author and comments for all the patches I receive. I am pretty sure if any of you are using manual gatekeeper workflow process then you will want this. I think this is how GIT operates.<br><br>Do you think this will be a new feature for Bzr?<br><br>Niben<br><br>--- On <b>Wed, 5/27/09, Martin Pool <i><mbp@sourcefrog.net></i></b> wrote:<br><blockquote style="border-left: 2px solid rgb(16, 16, 255); margin-left: 5px; padding-left: 5px;"><br>From: Martin Pool <mbp@sourcefrog.net><br>Subject: Re: merging selective changes from merge directive patch file.<br>To: "Niben M Singh" <niben_s@rocketmail.com><br>Cc: "John Arbash Meinel" <john@arbash-meinel.com>,
"bazaar" <bazaar@lists.canonical.com><br>Date: Wednesday, May 27, 2009, 4:18 PM<br><br><div class="plainMail">2009/5/27 Niben M Singh <<a ymailto="mailto:niben_s@rocketmail.com" href="/mc/compose?to=niben_s@rocketmail.com">niben_s@rocketmail.com</a>>:<br>> Thanks John and Martin!<br>><br>> This leads me to another question. If I am to merge a merge-directive (that may contain several change sets), is there an easy way to commit using the original comments and author? It seems after reviewing every patches, I need to add my own comments while committing and it will also list me as the author of the commit. I understand the log will show both, but it does not make sense to me to repeat the original comment while committing a patch after review.<br>><br>> "bzr pull" does that but I can only use it when the branch has not diverged.<br>><br>> How does PQM handle this?<br><br>Mainstream pqm I believe doesn't currently handle
them, but it certainly should.<br><br>I believe you should be able to pull from a merge directive if it has<br>new revisions that can perfectly fit on the destination branch. If<br>there's divergence you'll need to do the merge and reconcile (and<br>perhaps test or inspect it) yourself. At the moment you then need to<br>make up your own message but it would be nice if the message and<br>author carried across.<br><br>-- <br>Martin <<a href="http://launchpad.net/%7Embp/" target="_blank">http://launchpad.net/~mbp/</a>><br></div></blockquote></td></tr></table><br>