[25739] in Source-Commits
/svn/athena r25206 - trunk/third/moira
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jun 30 13:55:48 2011
Date: Thu, 30 Jun 2011 13:55:42 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106301755.p5UHtg8T017646@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-30 13:55:42 -0400 (Thu, 30 Jun 2011)
New Revision: 25206
Modified:
trunk/third/moira/00README
Log:
Remember to remove files removed by upstream
Modified: trunk/third/moira/00README
===================================================================
--- trunk/third/moira/00README 2011-06-30 17:44:24 UTC (rev 25205)
+++ trunk/third/moira/00README 2011-06-30 17:55:42 UTC (rev 25206)
@@ -27,6 +27,19 @@
svn status | awk '/^?/ { print $2; }' | xargs svn add
+ Also, you'll need to delete any files that no longer exist. One
+ way to do this (probably not the best way) is to go back to your
+ moira working copy, and to a reverse merge of the previous imported
+ revision. For example, if the last snapshot was from moira r3987,
+ and the current one is r4042:
+
+ ~/scratch/moira$ svn merge -r4042:3987 .
+
+ Then run "svn status" and looked for _added_ files (it's a reverse
+ merge), and those are the files to delete. Or, comb the moirac
+ discuss meeting and look for "Removed:" in the commit messages. Or
+ do something else.
+
7) Run "svn diff" and skim the changes to make sure they look reasonable.
8) Edit debian/changelog, and bump the version number, including the
