gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity
Files
0e28374131c794d743684e4f0378472bb3ac7230
taskwarrior-2.x/test
History
Johannes Schlatow 0e28374131 Bug #1117 
Fixed some other merge issues with the sorting order of equally timestamped
entries in undo.data (see #1104).

1. The fact that both files can begin with equal timestamps but different
   modifications has not been taken into account.

2. Besides the fact that the relative order within the same data file must
   be preservered as introduced before, we also need a unique order for entries
   of different data files so that each machine comes to the same merge result.
   This has now been achieved by taking the UUIDs into account as soon as the
   timestamps are equal.
2012-11-23 13:03:32 +01:00
..
json
Unit Tests
2011-05-22 14:41:40 -04:00
.gitignore
Unit tests
2012-09-12 00:00:54 +02:00
abbreviation.t
Portability
2012-07-30 18:49:50 +10:00
add.t
Portability
2012-07-30 18:49:50 +10:00
alias.t
Portability
2012-07-30 18:49:50 +10:00
annotate.t
Portability
2012-07-30 18:49:50 +10:00
append.t
Portability
2012-07-30 18:49:50 +10:00
args.1.t
Portability
2012-07-30 18:49:50 +10:00
args.2.t
Portability
2012-07-30 18:49:50 +10:00
args.3.t
Portability
2012-07-30 18:49:50 +10:00
args.4.t
Portability
2012-07-30 18:49:50 +10:00
args.5.t
Portability
2012-07-30 18:49:50 +10:00
args.t
Portability
2012-07-30 18:49:50 +10:00
autocomplete.t.cpp
Copyright
2012-01-02 23:32:10 -05:00
backslash.t
Portability
2012-07-30 18:49:50 +10:00
bash_completion.t
Enhancement
2012-09-16 22:11:52 -04:00
basic.t
Portability
2012-07-30 18:49:50 +10:00
bug.299.t
Portability
2012-07-30 18:49:50 +10:00
bug.327.t
Portability
2012-07-30 18:49:50 +10:00
bug.360.t
Portability
2012-07-30 18:49:50 +10:00
bug.368.t
Portability
2012-07-30 18:49:50 +10:00
bug.414.t
Portability
2012-07-30 18:49:50 +10:00
bug.417.t
Portability
2012-07-30 18:49:50 +10:00
bug.418.t
Portability
2012-07-30 18:49:50 +10:00
bug.425.t
Portability
2012-07-30 18:49:50 +10:00
bug.434.t
Portability
2012-07-30 18:49:50 +10:00
bug.438.t
Portability
2012-07-30 18:49:50 +10:00
bug.440.t
Portability
2012-07-30 18:49:50 +10:00
bug.441.t
Portability
2012-07-30 18:49:50 +10:00
bug.455.t
Portability
2012-07-30 18:49:50 +10:00
bug.480.t
Portability
2012-07-30 18:49:50 +10:00
bug.485.x
Portability
2012-07-30 18:49:50 +10:00
bug.489.t
Portability
2012-07-30 18:49:50 +10:00
bug.495.t
Portability
2012-07-30 18:49:50 +10:00
bug.555.t
Portability
2012-07-30 18:49:50 +10:00
bug.580.t
Portability
2012-07-30 18:49:50 +10:00
bug.605.t
Portability
2012-07-30 18:49:50 +10:00
bug.628.t
Portability
2012-07-30 18:49:50 +10:00
bug.634.t
Portability
2012-07-30 18:49:50 +10:00
bug.635.t
Portability
2012-07-30 18:49:50 +10:00
bug.649.t
Portability
2012-07-30 18:49:50 +10:00
bug.656.t
Portability
2012-07-30 18:49:50 +10:00
bug.668.t
Portability
2012-07-30 18:49:50 +10:00
bug.674.t
Portability
2012-07-30 18:49:50 +10:00
bug.694.t
Portability
2012-07-30 18:49:50 +10:00
bug.697.x
Portability
2012-07-30 18:49:50 +10:00
bug.703.t
Portability
2012-07-30 18:49:50 +10:00
bug.708.t
Portability
2012-07-30 18:49:50 +10:00
bug.804.t
Portability
2012-07-30 18:49:50 +10:00
bug.818.t
Portability
2012-07-30 18:49:50 +10:00
bug.819.t
Portability
2012-07-30 18:49:50 +10:00
bug.835.t
Portability
2012-07-30 18:49:50 +10:00
bug.837.t
Portability
2012-07-30 18:49:50 +10:00
bug.839.t
Portability
2012-07-30 18:49:50 +10:00
bug.851.t
Portability
2012-07-30 18:49:50 +10:00
bug.856.t
Portability
2012-07-30 18:49:50 +10:00
bug.860.t
Portability
2012-07-30 18:49:50 +10:00
bug.879.t
Portability
2012-07-30 18:49:50 +10:00
bug.884.t
Portability
2012-07-30 18:49:50 +10:00
bug.886.t
Portability
2012-07-30 18:49:50 +10:00
bug.899.t
Portability
2012-07-30 18:49:50 +10:00
bug.906.t
Portability
2012-07-30 18:49:50 +10:00
bug.917.t
Portability
2012-07-30 18:49:50 +10:00
bug.924.t
Portability
2012-07-30 18:49:50 +10:00
bug.932.t
Portability
2012-07-30 18:49:50 +10:00
bug.954.t
Portability
2012-07-30 18:49:50 +10:00
bug.955.t
Portability
2012-07-30 18:49:50 +10:00
bug.956.t
Unit Tests
2012-09-16 15:16:32 -04:00
bug.972.t
Portability
2012-07-30 18:49:50 +10:00
bug.982.x
Portability
2012-07-30 18:49:50 +10:00
bug.986.t
Portability
2012-07-30 18:49:50 +10:00
bug.987.x
Portability
2012-07-30 18:49:50 +10:00
bug.990.t
Portability
2012-07-30 18:49:50 +10:00
bug.991.t
Portability
2012-07-30 18:49:50 +10:00
bug.1006.t
Portability
2012-07-30 18:49:50 +10:00
bug.1023.t
Portability
2012-07-30 18:49:50 +10:00
bug.1031.t
Bug #1031
2012-09-26 23:06:42 -04:00
bug.1036.t
Portability
2012-07-30 18:49:50 +10:00
bug.1043.t
Portability
2012-07-30 18:49:50 +10:00
bug.1044.t
Portability
2012-07-30 18:49:50 +10:00
bug.1056.t
Unit Tests
2012-09-27 21:21:43 -04:00
bug.1065.t
Unit Tests
2012-08-28 14:36:21 +02:00
bug.1104.t
Bug #1117
2012-11-23 13:03:32 +01:00
bug.1117.t
Bug #1117
2012-11-23 13:03:32 +01:00
bug.annotate.t
Portability
2012-07-30 18:49:50 +10:00
bug.annual.t
Portability
2012-07-30 18:49:50 +10:00
bug.before.t
Portability
2012-08-28 17:27:13 +02:00
bug.bulk.t
Portability
2012-07-30 18:49:50 +10:00
bug.c001.t
Portability
2012-07-30 18:49:50 +10:00
bug.cal.t
Portability
2012-07-30 18:49:50 +10:00
bug.concat.t
Portability
2012-07-30 18:49:50 +10:00
bug.hang.t
Portability
2012-07-30 18:49:50 +10:00
bug.hasnt.t
Portability
2012-07-30 18:49:50 +10:00
bug.mergedeps.t.postponed
Portability
2012-07-30 18:49:50 +10:00
bug.period.t
Portability
2012-07-30 18:49:50 +10:00
bug.range.t
Portability
2012-07-30 18:49:50 +10:00
bug.recur.t
Portability
2012-07-30 18:49:50 +10:00
bug.sort.t
Portability
2012-07-30 18:49:50 +10:00
bug.start.extra.t
Portability
2012-07-30 18:49:50 +10:00
bug.summary.t
Portability
2012-07-30 18:49:50 +10:00
bug.uuid.t
Portability
2012-07-30 18:49:50 +10:00
bulk.t
Portability
2012-07-30 18:49:50 +10:00
cal.t
Portability
2012-07-30 18:49:50 +10:00
caseless.t
Portability
2012-07-30 18:49:50 +10:00
CMakeLists.txt
Unit tests
2012-09-12 00:00:54 +02:00
color.active.t
Portability
2012-07-30 18:49:50 +10:00
color.blocked.t
Portability
2012-07-30 18:49:50 +10:00
color.deprecated.t
Portability
2012-07-30 18:49:50 +10:00
color.disable.t
Portability
2012-07-30 18:49:50 +10:00
color.due.t
Portability
2012-07-30 18:49:50 +10:00
color.duetoday.t
Portability
2012-07-30 18:49:50 +10:00
color.err.t
Portability
2012-07-30 18:49:50 +10:00
color.keyword.t
Portability
2012-07-30 18:49:50 +10:00
color.overdue.t
Portability
2012-07-30 18:49:50 +10:00
color.pri.t
Portability
2012-07-30 18:49:50 +10:00
color.project.t
Portability
2012-07-30 18:49:50 +10:00
color.recurring.t
Portability
2012-07-30 18:49:50 +10:00
color.t.cpp
Copyright
2012-01-02 23:32:10 -05:00
color.tag.t
Portability
2012-07-30 18:49:50 +10:00
color.tagged.t
Portability
2012-07-30 18:49:50 +10:00
completed.t
Portability
2012-07-30 18:49:50 +10:00
config.obsolete.t
Portability
2012-07-30 18:49:50 +10:00
config.t.cpp
Copyright
2012-01-02 23:32:10 -05:00
confirmation.t
Portability
2012-07-30 18:49:50 +10:00
count.t
Portability
2012-07-30 18:49:50 +10:00
countdown.t
Portability
2012-07-30 18:49:50 +10:00
custom.columns.t
Portability
2012-07-30 18:49:50 +10:00
custom.priority_long.t
Portability
2012-07-30 18:49:50 +10:00
custom.recur_ind.t
Portability
2012-07-30 18:49:50 +10:00
custom.t
Portability
2012-07-30 18:49:50 +10:00
custom.tag_ind.t
Portability
2012-07-30 18:49:50 +10:00
date.iso.t
Portability
2012-07-30 18:49:50 +10:00
date.t.cpp
Code Cleanup
2012-09-04 22:04:41 -04:00
dateformat.t
Code Cleanup
2012-08-02 00:11:12 -04:00
datesort.t
Portability
2012-07-30 18:49:50 +10:00
default.t
Portability
2012-07-30 18:49:50 +10:00
delete.t
Portability
2012-07-30 18:49:50 +10:00
denotate.t
Portability
2012-07-30 18:49:50 +10:00
dependencies.t
Portability
2012-07-30 18:49:50 +10:00
directory.t.cpp
Enhancement
2012-05-25 18:03:06 -04:00
dom.2.t
Portability
2012-07-30 18:49:50 +10:00
dom.t.cpp
Code Cleanup
2012-09-04 22:04:41 -04:00
due.t
Portability
2012-07-30 18:49:50 +10:00
duplicate2.t
Portability
2012-07-30 18:49:50 +10:00
duplicate.t
Portability
2012-07-30 18:49:50 +10:00
duration.t.cpp
Bug
2012-04-04 18:42:11 -04:00
enpassant.t
Portability
2012-07-30 18:49:50 +10:00
export.yaml.t
Portability
2012-07-30 18:49:50 +10:00
feature.559.t
Portability
2012-07-30 18:49:50 +10:00
feature.608.t
Portability
2012-07-30 18:49:50 +10:00
feature.632.t
Portability
2012-07-30 18:49:50 +10:00
feature.725.t
Portability
2012-07-30 18:49:50 +10:00
feature.891.t
Portability
2012-07-30 18:49:50 +10:00
feature.1013.t
Portability
2012-07-30 18:49:50 +10:00
feature.exit.t
Portability
2012-07-30 18:49:50 +10:00
file.t.cpp
File::rename
2012-10-03 22:13:47 -04:00
filter-prefix.t
Portability
2012-07-30 18:49:50 +10:00
filter.t
Portability
2012-07-30 18:49:50 +10:00
fontunderline.t
Portability
2012-07-30 18:49:50 +10:00
history.annual.t
Portability
2012-07-30 18:49:50 +10:00
history.monthly.t
Portability
2012-07-30 18:49:50 +10:00
hook.on-exit.t
Portability
2012-07-30 18:49:50 +10:00
hook.on-launch.t
Portability
2012-07-30 18:49:50 +10:00
hyphenate.t
Bug
2012-10-20 14:34:12 -04:00
i18n.t.cpp
Code Cleanup
2012-09-04 22:04:41 -04:00
ids.t
Portability
2012-07-30 18:49:50 +10:00
import.t
Portability
2012-07-30 18:49:50 +10:00
import.todo.sh.t
Portability
2012-07-30 18:49:50 +10:00
import.yaml.t
Portability
2012-07-30 18:49:50 +10:00
json_test.cpp
Copyright
2012-01-02 23:32:10 -05:00
json_test.t
Portability
2012-07-30 18:49:50 +10:00
json.t.cpp
Merge branch 'master' into 2.2.0
2012-09-18 22:58:59 +02:00
label.t
Portability
2012-07-30 18:49:50 +10:00
limit.t
Portability
2012-07-30 18:49:50 +10:00
list.all.projects.t
Portability
2012-07-30 18:49:50 +10:00
list.all.tags.t
Portability
2012-07-30 18:49:50 +10:00
list.t.cpp
Copyright
2012-01-02 23:32:10 -05:00
log.t
Portability
2012-07-30 18:49:50 +10:00
merge.duplicates.t
Portability
2012-07-30 18:49:50 +10:00
merge.t
Portability
2012-07-30 18:49:50 +10:00
nag.t
Portability
2012-07-30 18:49:50 +10:00
next.t
Portability
2012-07-30 18:49:50 +10:00
nibbler.t.cpp
Code Cleanup
2012-09-04 22:04:41 -04:00
oldest.t
Portability
2012-07-30 18:49:50 +10:00
op_and.t
Portability
2012-07-30 18:49:50 +10:00
op_gt.t
Portability
2012-07-30 18:49:50 +10:00
op_gte.t
Portability
2012-07-30 18:49:50 +10:00
op_lt.t
Portability
2012-07-30 18:49:50 +10:00
op_lte.t
Portability
2012-07-30 18:49:50 +10:00
op_or.t
Portability
2012-07-30 18:49:50 +10:00
op_xor.t
Portability
2012-07-30 18:49:50 +10:00
overdue.t
Portability
2012-07-30 18:49:50 +10:00
override.t
Portability
2012-07-30 18:49:50 +10:00
path.t.cpp
Copyright
2012-01-02 23:32:10 -05:00
prepend.t
Portability
2012-07-30 18:49:50 +10:00
pri_sort.t
Portability
2012-07-30 18:49:50 +10:00
problems
Portability
2012-07-30 18:49:50 +10:00
project.t
Bug #1056
2012-09-23 08:07:11 -04:00
rc.override.t
Portability
2012-07-30 18:49:50 +10:00
rc.t
Portability
2012-07-30 18:49:50 +10:00
recur.limit.t
Portability
2012-07-30 18:49:50 +10:00
recur.sort.t
Portability
2012-07-30 18:49:50 +10:00
recur.t
Portability
2012-07-30 18:49:50 +10:00
recur.until.t
Portability
2012-07-30 18:49:50 +10:00
recur.weekdays.t
Portability
2012-07-30 18:49:50 +10:00
roundtrip.t
Portability
2012-07-30 18:49:50 +10:00
run_all.in
Unit tests
2012-09-12 00:00:54 +02:00
rx.t.cpp
Unit Tests
2012-09-10 22:41:34 +02:00
sequence.t
Portability
2012-07-30 18:49:50 +10:00
shadow.t
Portability
2012-07-30 18:49:50 +10:00
shell.t
Portability
2012-07-30 18:49:50 +10:00
sorting.t
Portability
2012-07-30 18:49:50 +10:00
special.t
Portability
2012-07-30 18:49:50 +10:00
start.t
Portability
2012-07-30 18:49:50 +10:00
subproject.t
Portability
2012-07-30 18:49:50 +10:00
substitute.t
Portability
2012-07-30 18:49:50 +10:00
t2.t.cpp
Code Cleanup
2012-09-04 22:04:41 -04:00
t.t.cpp
Copyright
2012-01-02 23:32:10 -05:00
tag.t
Portability
2012-07-30 18:49:50 +10:00
taskmod.t.cpp
Code Cleanup
2012-09-04 22:04:41 -04:00
tdb2.t.cpp
Code Cleanup
2012-09-04 22:04:41 -04:00
test.cpp
Unit Tests
2012-01-05 23:29:33 -05:00
test.h
Copyright
2012-01-02 23:32:10 -05:00
text.t.cpp
Code Cleanup
2012-03-11 15:33:45 -04:00
timesheet.t
Portability
2012-07-30 18:49:50 +10:00
uda_date.t
Portability
2012-07-30 18:49:50 +10:00
uda_duration.t
Portability
2012-07-30 18:49:50 +10:00
uda_numeric.t
Portability
2012-07-30 18:49:50 +10:00
uda_orphan.t
Portability
2012-07-30 18:49:50 +10:00
uda_report.t
Portability
2012-07-30 18:49:50 +10:00
uda_string.t
Portability
2012-07-30 18:49:50 +10:00
uda_value.t
Portability
2012-07-30 18:49:50 +10:00
undo.t
Bug
2012-08-11 07:03:56 -04:00
upgrade.t
Portability
2012-07-30 18:49:50 +10:00
urgency.t
Portability
2012-07-30 18:49:50 +10:00
uri.t.cpp
Copyright
2012-01-02 23:32:10 -05:00
utf8.t
Portability
2012-07-30 18:49:50 +10:00
util.t.cpp
Bug #1056
2012-09-23 08:07:11 -04:00
uuid.t
Portability
2012-07-30 18:49:50 +10:00
verbose.t
Portability
2012-07-30 18:49:50 +10:00
view.t.cpp
Code Cleanup
2012-09-04 22:04:41 -04:00
wait.t
Portability
2012-07-30 18:49:50 +10:00