From da37c08dbd3fd56661184b06d5848c4d733c46c9 Mon Sep 17 00:00:00 2001 From: Federico Hernandez Date: Mon, 10 Sep 2012 21:45:49 +0200 Subject: [PATCH 1/3] Documentation - bumped information in related files to 2.1.2 --- ChangeLog | 4 ++++ NEWS | 33 ++++++++++----------------------- doc/man/task-color.5.in | 2 +- doc/man/task-faq.5.in | 2 +- doc/man/task-sync.5.in | 2 +- doc/man/task-tutorial.5.in | 2 +- doc/man/task.1.in | 2 +- doc/man/taskrc.5.in | 2 +- 8 files changed, 20 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc63b3634..8017e5ad8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ 2.1.2 () +Bugs + + Bug fix release regarding #1104, which causes duplicate UUIDs during + the merge command. + ------ old releases ------------------------------ 2.1.1 (2012-07-24) 46c5f8b826838ce96d9df7fcd3039de3c43483dd diff --git a/NEWS b/NEWS index 589ef17e3..6f26c77de 100644 --- a/NEWS +++ b/NEWS @@ -1,34 +1,21 @@ -New Features in taskwarrior 2.1.0 +New bug fixes in taskwarrior 2.1.2 - - The new 'project.indented' format is available and used in the 'projects' - and 'summary' commands. - - Support for the 'scheduled' date for a task, which represent the earliest - opportunity to work on a task. - - All tasks may now be given an 'until' date, after which they will expire - and are deleted. - - Improved UTF8 handling for wide characters. - - User defined attributes. - - Partial UUIDs must now be at least 14 characters, up from 9. This - disambiguates a commonly date format. + - Important bug fix release regarding duplicate UUIDs during the merge command. - Please refer to the ChangeLog file for full details. There are too many to - list here. +New features in taskwarrior 2.1.2 -New commands in taskwarrior 2.1.0 + - None - - New 'ready' report that lists tasks ready for work, sorted by urgency. - - New 'udas' command shows UDA details and warnings. - - New '_udas' helper command lists UDA names for completion purposes. +New commands in taskwarrior 2.1.2 -New configuration options in taskwarrior 2.1.0 + - None - - urgency.scheduled.coefficient - - urgency.uda..coefficient - - color.scheduled - - color.blocking +New configuration options in taskwarrior 2.1.2 -Newly deprecated features in taskwarrior 2.1.0 + - None + +Newly deprecated features in taskwarrior 2.1.2 - None diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in index a913ca640..c8cb2e8c8 100644 --- a/doc/man/task-color.5.in +++ b/doc/man/task-color.5.in @@ -1,4 +1,4 @@ -.TH task-color 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals" +.TH task-color 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals" .SH NAME task-color \- A color tutorial for the taskwarrior command line todo manager. diff --git a/doc/man/task-faq.5.in b/doc/man/task-faq.5.in index b3a02adcb..259169521 100644 --- a/doc/man/task-faq.5.in +++ b/doc/man/task-faq.5.in @@ -1,4 +1,4 @@ -.TH task-faq 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals" +.TH task-faq 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals" .SH NAME task-faq \- A FAQ for the task(1) command line todo manager. diff --git a/doc/man/task-sync.5.in b/doc/man/task-sync.5.in index 458f38d3e..4b2ccd7ac 100644 --- a/doc/man/task-sync.5.in +++ b/doc/man/task-sync.5.in @@ -1,4 +1,4 @@ -.TH task-sync 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals" +.TH task-sync 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals" .SH NAME task-sync \- A tutorial for the task(1) data synchronization capabilities. diff --git a/doc/man/task-tutorial.5.in b/doc/man/task-tutorial.5.in index 9feecfd11..b9740cef7 100644 --- a/doc/man/task-tutorial.5.in +++ b/doc/man/task-tutorial.5.in @@ -1,4 +1,4 @@ -.TH task-tutorial 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals" +.TH task-tutorial 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals" .SH NAME task-tutorial \- A tutorial for the task(1) command line todo manager. diff --git a/doc/man/task.1.in b/doc/man/task.1.in index 8e868ef72..4ea5ee103 100644 --- a/doc/man/task.1.in +++ b/doc/man/task.1.in @@ -1,4 +1,4 @@ -.TH task 1 2012-07-24 "${PACKAGE_STRING}" "User Manuals" +.TH task 1 2012-09-10 "${PACKAGE_STRING}" "User Manuals" .SH NAME task \- A command line todo manager. diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in index 91c5cfdc7..be55a2986 100644 --- a/doc/man/taskrc.5.in +++ b/doc/man/taskrc.5.in @@ -1,4 +1,4 @@ -.TH taskrc 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals" +.TH taskrc 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals" .SH NAME taskrc \- Configuration file for the task(1) command From 36e33179070eedcea70155a2ab52c9fb786b63c6 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 31 Aug 2012 14:24:54 +0200 Subject: [PATCH 2/3] Prebuild - Removed obsolete WIN32 reference that causes lots of verbose warnings from cmake. --- CMakeLists.txt | 1 - cmake.h.in | 1 - 2 files changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd07ffeb4..603adb5e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required (VERSION 2.8) -set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required include (CheckFunctionExists) include (CheckStructHasMember) diff --git a/cmake.h.in b/cmake.h.in index f4c39065d..29f9fd5ed 100644 --- a/cmake.h.in +++ b/cmake.h.in @@ -39,7 +39,6 @@ Override PACKAGE_LANGUAGE, then #cmakedefine NETBSD #cmakedefine HAIKU #cmakedefine SOLARIS -#cmakedefine WIN32 #cmakedefine UNKNOWN /* Found the lua library */ From d868294d90703761578e3e4808ed1787d6810221 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 28 Aug 2012 15:19:17 +0200 Subject: [PATCH 3/3] Unit Tests - Corrected FreeBSD rx unit tests. Conflicts: test/rx.t.cpp --- test/rx.t.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rx.t.cpp b/test/rx.t.cpp index b42846c52..a7046cc53 100644 --- a/test/rx.t.cpp +++ b/test/rx.t.cpp @@ -88,7 +88,7 @@ int main (int argc, char** argv) ut.ok (r9.match (start, end, text), "e there are matches"); ut.is (start.size (), (size_t) 6, "e == 6 matches"); -#ifdef DARWIN +#if defined(DARWIN) || defined(CYGWIN) || defined(FREEBSD) text = "this is the end."; ut.pass (text + " =~ /\\bthe/"); ut.pass (text + " =~ /the\\b/");