Back to the main page.

Bug 3204 - ft_inside_vol reverted to older version

Status CLOSED FIXED
Reported 2016-11-07 10:10:00 +0100
Modified 2017-01-17 11:29:46 +0100
Product: FieldTrip
Component: forward
Version: unspecified
Hardware: PC
Operating System: Mac OS
Importance: P5 normal
Assigned to: Robert Oostenveld
URL:
Tags:
Depends on:
Blocks:
See also:

Simon - 2016-11-07 10:10:00 +0100

https://github.com/fieldtrip/fieldtrip/commit/9afc07a20dbbeb7b637f7a11492fd61ea3c56665 it seems some automatic synchronisation reverted ft_vol_inside to an older version.


Robert Oostenveld - 2016-11-07 10:12:18 +0100

I did notice something wrong with synchronization in the weekend. I will look into it.


Robert Oostenveld - 2016-11-07 10:16:58 +0100

I found this one, which seems to have reverted it. I suppose something went wrong with the file timestamps. https://github.com/fieldtrip/fieldtrip/commit/9afc07a20dbbeb7b637f7a11492fd61ea3c56665#diff-3f959169edda746c3f8ad98589e9a217


Robert Oostenveld - 2016-11-07 10:32:59 +0100

This fixes it. Thanks for noticing! mac011> git commit -a [master 376514a] FIX - reverted incorrect synchronized files, see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=3204 14 files changed, 218 insertions(+), 107 deletions(-) mac011> git push upstream master Counting objects: 19, done. Delta compression using up to 4 threads. Compressing objects: 100% (19/19), done. Writing objects: 100% (19/19), 3.55 KiB | 0 bytes/s, done. Total 19 (delta 18), reused 0 (delta 0) remote: Resolving deltas: 100% (18/18), completed with 18 local objects. To github.com:fieldtrip/fieldtrip.git 03d013f..376514a master -> master


Robert Oostenveld - 2016-11-07 10:33:10 +0100

fixed


Robert Oostenveld - 2017-01-17 11:29:46 +0100

closed multiple bugs that were resolved some time ago