Bump version, update news, ignore vim swap files

joshuaulrich · Nov 7, 2022 · ab42de9 · ab42de9
1 parent 58046d7
commit ab42de9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -9,3 +9,4 @@ LICENSE
 ^0.*\.patch$
 ^.*\.tar.gz$
 Makefile
+^\.sw*$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: xts
 Type: Package
 Title: eXtensible Time Series
-Version: 0.12.2.1
+Version: 0.12.9900
 Authors@R: c(
   person(given=c("Jeffrey","A."), family="Ryan", role=c("aut","cph")),
   person(given=c("Joshua","M."), family="Ulrich", role=c("cre","aut"), email="josh.m.ulrich@gmail.com"),

diff --git a/NEWS b/NEWS
@@ -80,6 +80,13 @@ o Updated C entry points so they're not able to accidentally be found via
   dynamic lookup (i.e. `.Call("foo", ...)`). This makes each call to the C
   code a few microseconds faster, which is nice. (#260)
 
+o Made `merge.xts()` results consistent with `merge.zoo()` for zero-length xts
+  objects with columns. The result of `merge.xts()` did not include the
+  columns of any objects that had one or more columns, but zero rows. A join
+  should include all the columns of the joined objects, regardless of the
+  number of rows in the object. This is consistent with `merge.zoo()`. Thanks
+  to Ethan B. Smith for the report and testing! (#222)
+
 
 ################################################################################
 Changed in xts 0.12.2: