From 93b0183d3cae436732b48d36aa9b54964854a0a4 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Fri, 29 Apr 2011 01:35:21 -0400
Subject: add another heuristic for changes stanzas

---
 doc/HACKING | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

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.
-- 
cgit v1.2.3-54-g00ecf