[tor-commits] [tor/master] add another heuristic for changes stanzas

[nickm at torproject.org]

commit 93b0183d3cae436732b48d36aa9b54964854a0a4
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Apr 29 01:35:21 2011 -0400

    add another heuristic for changes stanzas
---
 doc/HACKING |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/doc/HACKING b/doc/HACKING
index 6407ff2..6336232 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.