From: Antoine Pelisse Date: Wed, 19 Mar 2014 15:18:58 GMT Subject: Re: [PATCH 2/3] remote-hg: allow invalid bookmarks in a few edge cases Message-ID: In-Reply-To: On Wed, Mar 19, 2014 at 4:00 PM, Max Horn wrote: >> Thank you for working on this. >> I believe it would be fair that you forget about patch 1/3 as you fix >> it in this patch (2/3). >> Also, I think it would be best NOT to integrate a patch (mine) that >> breaks a test, as it >> would make bisect harder to use. > > OK, makes sense. I didn't want to step on anybodies feet by hijacking previously made work (however small or big it might be -- I've been burned by this before). Anyway, so I'll squash the first two commits together (or all three even?), and edit the message. But I'd like to properly attribute that you discovered the issue, so perhaps I can add something like "Reported-by: Antoine Pelisse" or so? Yes, I think you can squash all three commits into one, and use the reported-by line that you mentioned. Thanks, Antoine