[CalendarServer-changes] [4613] CalendarServer/trunk/support

[source_changes at macosforge.org]

Revision: 4613
          http://trac.macosforge.org/projects/calendarserver/changeset/4613
Author:   wsanchez at apple.com
Date:     2009-10-20 12:59:23 -0700 (Tue, 20 Oct 2009)
Log Message:
-----------
svn branch tools

Added Paths:
-----------
    CalendarServer/trunk/support/diffbranch
    CalendarServer/trunk/support/mergebranch

Added: CalendarServer/trunk/support/diffbranch
===================================================================
--- CalendarServer/trunk/support/diffbranch	                        (rev 0)
+++ CalendarServer/trunk/support/diffbranch	2009-10-20 19:59:23 UTC (rev 4613)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+branch_base_revision="$(
+  svn log --stop-on-copy "$1"									\
+    | grep -e '------------------------------------------------------------------------' -A 1	\
+    | egrep '^r'										\
+    | cut -d ' ' -f 1										\
+    | tail -1
+)";
+
+svn diff "-${branch_base_revision}" "$@";


Property changes on: CalendarServer/trunk/support/diffbranch
___________________________________________________________________
Added: svn:executable
   + *

Added: CalendarServer/trunk/support/mergebranch
===================================================================
--- CalendarServer/trunk/support/mergebranch	                        (rev 0)
+++ CalendarServer/trunk/support/mergebranch	2009-10-20 19:59:23 UTC (rev 4613)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+uri="$1"; shift;
+
+if [ -e "${uri}" ]; then
+   # URI is a file.  Get the URI.
+   uri="$(svn info --xml "${uri}" | sed -n 's|<url>\(.*\)</url>|\1|p')";
+fi;
+
+branch_base_revision="$(
+  svn log --stop-on-copy "${uri}"								\
+    | grep -e '------------------------------------------------------------------------' -A 1	\
+    | egrep '^r'										\
+    | cut -d ' ' -f 1										\
+    | tail -1
+)";
+
+svn merge "-${branch_base_revision}:HEAD" "${uri}" "$@";


Property changes on: CalendarServer/trunk/support/mergebranch
___________________________________________________________________
Added: svn:executable
   + *
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091020/6c14fdd9/attachment.html>