#
#
# patch "NEWS"
#  from [bf55b145df1846c77fedba93641e7f56a64de876]
#    to [5bc9ffb18ca66a50a8d76f8ab99defa364312977]
#
# patch "UPGRADE"
#  from [d58d62aebea44b98f7fa9dd48abe93da41526d52]
#    to [d3d8c42e486ef104458fe758de268902a00ceae2]
#
# patch "configure.ac"
#  from [514115197e68db548065f885f801415f6b7cb38f]
#    to [618d08d5484b8e4a15e464d9e5f41edcad4a2dac]
#
# patch "debian/changelog"
#  from [2452cf3abc412535d88d39c482383bd4884d438e]
#    to [b57897fd7125f492779c8219f10ed95d3e0f2131]
#
# patch "visualc/config.h"
#  from [162e13be4c6fb10947d03e89adc24f3a59c0ecc2]
#    to [02345fd0fad87e1a93d5a86a0438245b5c4671a4]
#
# patch "win32/monotone.iss"
#  from [08202ab4240c95a452b6a64084541f756a27db42]
#    to [6c7d6275ca1d29ae6492832695f24de801c36d2d]
#
============================================================
--- NEWS	bf55b145df1846c77fedba93641e7f56a64de876
+++ NEWS	5bc9ffb18ca66a50a8d76f8ab99defa364312977
@@ -1,4 +1,4 @@
-??? ??? ?? ??:??:?? UTC 2007
+Mon May  7 14:08:44 UTC 2007

         0.35 release.

@@ -7,6 +7,16 @@
         - 'mkdir --no-respect-ignore PATH' now really skips any
           ignore directives from .mtn-ignore or Lua hooks

+        - Private keys are now stored more safely, using file
+          permissions.
+
+        - The editable log summary (what you get in an editor when
+          committing without -m) now includes information about which
+          branch the commit applies to.
+
+        - The status command and the editable log summary now show
+          the same details about the change.
+
         New features

         - 'automate identify', an automate version of 'mtn identify'.
@@ -16,9 +26,6 @@

         Other

-        - Private keys are now stored more safely, using file
-          permissions.
-
         - You can't drop the workspace root any more.

         Internal
============================================================
--- UPGRADE	d58d62aebea44b98f7fa9dd48abe93da41526d52
+++ UPGRADE	d3d8c42e486ef104458fe758de268902a00ceae2
@@ -1,4 +1,4 @@
-upgrading monotone to 0.34
+upgrading monotone to 0.35
 ==========================

 How to read this file:
============================================================
--- configure.ac	514115197e68db548065f885f801415f6b7cb38f
+++ configure.ac	618d08d5484b8e4a15e464d9e5f41edcad4a2dac
@@ -1,8 +1,8 @@ AC_PREREQ(2.58)
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.58)
-AC_INIT(monotone, 0.34, address@hidden)
+AC_INIT(monotone, 0.35, address@hidden)
 AM_INIT_AUTOMAKE([1.9 tar-ustar std-options])
 AC_CONFIG_SRCDIR([app_state.cc])
 AM_CONFIG_HEADER([config.h])
============================================================
--- debian/changelog	2452cf3abc412535d88d39c482383bd4884d438e
+++ debian/changelog	b57897fd7125f492779c8219f10ed95d3e0f2131
@@ -1,3 +1,9 @@
+monotone (0.35-0.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Richard Levitte <address@hidden>  Mon, 07 May 2007 16:08:44 +0200
+
 monotone (0.34-0.1) unstable; urgency=low

   * New upstream release.
============================================================
--- visualc/config.h	162e13be4c6fb10947d03e89adc24f3a59c0ecc2
+++ visualc/config.h	02345fd0fad87e1a93d5a86a0438245b5c4671a4
@@ -1,11 +1,11 @@
 #ifndef CONFIG_H
 #define CONFIG_H 1

 #define PACKAGE "monotone"
-#define PACKAGE_STRING "monotone 0.34"
+#define PACKAGE_STRING "monotone 0.35"
 #define PACKAGE_BUGREPORT "address@hidden"
 #define LC_MESSAGES LC_CTYPE
-#define VERSION "0.34"
+#define VERSION "0.35"

 #ifdef _MSC_VER
 typedef unsigned long pid_t;
============================================================
--- win32/monotone.iss	08202ab4240c95a452b6a64084541f756a27db42
+++ win32/monotone.iss	6c7d6275ca1d29ae6492832695f24de801c36d2d
@@ -1,8 +1,8 @@ AppName=monotone
 [Setup]
 AppName=monotone
-AppVersion=0.34
-AppVerName=monotone 0.34
-OutputBaseFileName=monotone-0.34-setup
+AppVersion=0.35
+AppVerName=monotone 0.35
+OutputBaseFileName=monotone-0.35-setup
 AppCopyright=Copyright © 2002-2007 Graydon Hoare et al.
 AppPublisher=venge.net
 AppPublisherURL=http://www.monotone.ca/