Mercurial > hg > soundsoftware-site

diff test/fixtures/.svn/text-base/time_entries.yml.svn-base @ 524:1248a47e81b3 feature_36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:39:38 +0100
parents cbce1fd3b1b7
children
line wrap: on
line diff
--- a/test/fixtures/.svn/text-base/time_entries.yml.svn-base	Fri Jul 15 17:21:05 2011 +0100
+++ b/test/fixtures/.svn/text-base/time_entries.yml.svn-base	Mon Jul 25 14:39:38 2011 +0100
@@ -55,4 +55,18 @@
   hours: 7.65
   user_id: 1
   tyear: 2007
+time_entries_005: 
+  created_on: 2011-03-22 12:20:48 +02:00
+  tweek: 12
+  tmonth: 3
+  project_id: 5
+  comments: Time spent on a subproject
+  updated_on: 2011-03-22 12:20:48 +02:00
+  activity_id: 10
+  spent_on: 2011-03-22
+  issue_id: 
+  id: 5
+  hours: 7.65
+  user_id: 1
+  tyear: 2011