X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient:	geda-user AT delorie DOT com
X-Original-DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=googlemail.com; s=20120113;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:content-type;
	bh=sREDe2AxNk5AfQoJwY9eXtVINY9TRr3XZJb3DXF3gJI=;
	b=tMBax13u89gpkdchJGDFogFE8NzHUGyy4KnW0kdY6W4Fl8qGHLALzMBUN86YBiX5ev
	69y+i6vQHrjd00h6FnEp1IK/kD5kpSamQn5MTE0HsC17shGXp/cJlrpJT4sA/VkNGEl+
	wNU3mhcegXyzkeAeDudbqQNMMzfgd5PabYcX0AsDw0Mu/MIlPhYxuyQQwLtAY5WB5lAk
	EhK3+sDlVv8IA0yTPl0cV1AdJLxrI1cCh+radNVZKSwwt+vED95XwgwlY5rYkxWx38TK
	ZHa90MwSLxHXvgnGs5aQ4Q0lk8FuxOlGZJy4i20Ylm9NQL4TCWpTg02wQegYx6FvGn0J
	jwkA==
MIME-Version:	1.0
X-Received:	by 10.202.213.78 with SMTP id m75mr51708891oig.56.1451937147450;
	Mon, 04 Jan 2016 11:52:27 -0800 (PST)
In-Reply-To:	<201601041943.u04Jh6sg014305@envy.delorie.com>
References:	<CAC4O8c_p5bMB1cKzDEsQFSnbZvY3TgnczH94pO_qCoJmiv2iWQ AT mail DOT gmail DOT com>
	<CAJXU7q9rMcQpLU5020RoZTqskT4moOS6f3Ugw+g3_mhO565MLg AT mail DOT gmail DOT com>
	<CAC4O8c-nPx1isS2DA4=X1vQFVY51vQ6pAY6sSfHBMog_m0_2dg AT mail DOT gmail DOT com>
	<CAJXU7q8jLiY2oAGmkgfXfzdNoAg2xVRx8bxgAXyF_qqYs=9Dgw AT mail DOT gmail DOT com>
	<CAC4O8c8=Vh7DcVrdrG4GE7ssBNG_VuxDLw2JSyg=Bv7Lnvfysg AT mail DOT gmail DOT com>
	<CAJXU7q-iNx7PVbZHe_SC+VGs1SN-zOSPEyQjBc6CS2qD8wnpvw AT mail DOT gmail DOT com>
	<CAC4O8c8sm-jp7+jvV_QJ9Zskwb31JsmPUA+BY2UkUMg31_Htsg AT mail DOT gmail DOT com>
	<CAJXU7q_K3xSdNWaZy3AZ_zCCAGWjvasc8TrJYrD5xz-CZujYDA AT mail DOT gmail DOT com>
	<CAC4O8c_=Hch0ttt56fyfTFaw+tcpsNG9ZA9wyfeLCynK=Bqp0A AT mail DOT gmail DOT com>
	<201601041943 DOT u04Jh6sg014305 AT envy DOT delorie DOT com>
Date:	Mon, 4 Jan 2016 19:52:27 +0000
Message-ID:	<CAJXU7q8Muzm6OE7BCupZ=KkiW_L-hdupkN-rU_v2u3KRDzU9=Q@mail.gmail.com>
Subject:	Re: [geda-user] Merging stuff. How to make it happen
From:	"Peter Clifton (petercjclifton AT googlemail DOT com) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
To:	gEDA User Mailing List <geda-user AT delorie DOT com>
Reply-To:	geda-user AT delorie DOT com
Errors-To:	nobody AT delorie DOT com
X-Mailing-List:	geda-user AT delorie DOT com
X-Unsubscribes-To:	listserv AT delorie DOT com

--001a113aca4ee8fc24052887750d
Content-Type: text/plain; charset=UTF-8

On 4 Jan 2016 19:45, "DJ Delorie" <dj AT delorie DOT com> wrote:
>
>
> > Ok.  I'll just post-process them all back to /**/ at the end of an arc
>
> Note that if you're not careful, making such changes and then
> reverting them marks all those line as "your fault" when people are
> looking for the last patch that touched them.
>
> > Fair enough.  I change the spacing sometimes when I think it will reduce
> > the chance that I'll make actual errors.  It sounds mundane but putting
>
> Again, note that such changes mask the history of those lines.

I had a quick chat to Peter Brett today (for a second opinion on whether
I'm being overly demanding), and he thought it seemed perfectly reasonable
to request cleaning up the branch before merge. (He said we should require
the test case work too!). I'm a fan of stgit myself, but Peter B pointed
out that there are also perfectly good tools within the core of git that
can do similar in terms of clean up.

Peter B also advocated merging for even trivial, one commit branches, and I
defer to his opinion on that one.

Peter

--001a113aca4ee8fc24052887750d
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<p dir=3D"ltr"><br>
On 4 Jan 2016 19:45, &quot;DJ Delorie&quot; &lt;<a href=3D"mailto:dj AT delori=
e.com">dj AT delorie DOT com</a>&gt; wrote:<br>
&gt;<br>
&gt;<br>
&gt; &gt; Ok.=C2=A0 I&#39;ll just post-process them all back to /**/ at the=
 end of an arc<br>
&gt;<br>
&gt; Note that if you&#39;re not careful, making such changes and then<br>
&gt; reverting them marks all those line as &quot;your fault&quot; when peo=
ple are<br>
&gt; looking for the last patch that touched them.<br>
&gt;<br>
&gt; &gt; Fair enough.=C2=A0 I change the spacing sometimes when I think it=
 will reduce<br>
&gt; &gt; the chance that I&#39;ll make actual errors.=C2=A0 It sounds mund=
ane but putting<br>
&gt;<br>
&gt; Again, note that such changes mask the history of those lines.</p>
<p dir=3D"ltr">I had a quick chat to Peter Brett today (for a second opinio=
n on whether I&#39;m being overly demanding), and he thought it seemed perf=
ectly reasonable to request cleaning up the branch before merge. (He said w=
e should require the test case work too!). I&#39;m a fan of stgit myself, b=
ut Peter B pointed out that there are also perfectly good tools within the =
core of git that can do similar in terms of clean up.</p>
<p dir=3D"ltr">Peter B also advocated merging for even trivial, one commit =
branches, and I defer to his opinion on that one.</p>
<p dir=3D"ltr">Peter</p>

--001a113aca4ee8fc24052887750d--

- Raw text -