From: Roger Dingledine <arma@torproject.org>
Date: Fri, 29 Apr 2011 05:35:21 +0000 (-0400)
Subject: add another heuristic for changes stanzas
X-Git-Tag: tor-0.2.3.1-alpha~19^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93b0183d3cae436732b48d36aa9b54964854a0a4;p=thirdparty%2Ftor.git

add another heuristic for changes stanzas
---

diff --git a/doc/HACKING b/doc/HACKING
index 6407ff23eb..633623217d 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -444,6 +444,10 @@ interesting and understandable.
 
    Present and imperative tense: not past.
 
+   If a given changes stanza showed up in a different release (e.g.
+   maint-0.2.1), be sure to make the stanzas identical (so people can
+   distinguish if these are the same change).
+
    2.5) Merge them in.
 
    2.6) Clean everything one last time.