Author: ajaquith
Date: Sun Feb 24 11:01:13 2008
New Revision: 630659
URL: http://svn.apache.org/viewvc?rev=630659&view=rev
Log:
Added ChangeLog convention for merge notes.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes?rev=630659&r1=630658&r2=630659&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes
(original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog-Stripes Sun
Feb 24 11:01:13 2008
@@ -1,5 +1,11 @@
2007-2-24 Andrew Jaquith
- * Merged with trunk 2.6.2-svn-2
+ * Merged with trunk 2.6.2-svn-2 (revisions 630646:630650)
* Added ChangeLog-Stripes to keep track of Stripes-related changes
separately.
+ Note to self: when merging from trunk, each "Merged with trunk" entry
+ assumes merging from this branch:
+
+ https://svn.apache.org/repos/asf/incubator/jspwiki/trunk
+
+ ...and each entry will specify the revisions it merges from and to
(from:to).
