|
Boost : |
Subject: [boost] Weirdness in SVN
From: Marshall Clow (mclow.lists_at_[hidden])
Date: 2013-06-19 09:50:16
Ok, this is quite worrisome to me.
This morning, bug #6136 was reopened:
https://svn.boost.org/trac/boost/ticket/6136
This is an "unused variable warning" in Boost.DateTime.
I fixed this bug in the trunk: https://svn.boost.org/trac/boost/changeset/80699
I merged this bug fix (and several others) to the release branch: https://svn.boost.org/trac/boost/changeset/80797
But the files (both trunk and release) appear not to contain the change.
If I do a "svn diff", the changes appear in the diff, but the file doesn't contain the change.
I checked the other files referenced in change set 80797, and they appear to be fine - just this one.
Any idea what could be happening here?
My only explanation at the moment is that "Subversion is lying to me", and that's both (a) a huge potential problem, and (b) doesn't suggest a course of action.
$ svn diff trunk/boost/date_time/format_date_parser.hpp -r 80698
Index: trunk/boost/date_time/format_date_parser.hpp
===================================================================
--- trunk/boost/date_time/format_date_parser.hpp (revision 80698)
+++ trunk/boost/date_time/format_date_parser.hpp (working copy)
@@ -256,7 +256,6 @@
// skip leading whitespace
while(std::isspace(*sitr) && sitr != stream_end) { ++sitr; }
- charT current_char = *sitr;
short year(0), month(0), day(0), day_of_year(0);// wkday(0);
/* Initialized the following to their minimum values. These intermediate
@@ -290,7 +289,6 @@
}
wkday = mr.current_match;
if (mr.has_remaining()) {
- current_char = mr.last_char();
use_current_char = true;
}
break;
@@ -310,7 +308,6 @@
}
wkday = mr.current_match;
if (mr.has_remaining()) {
- current_char = mr.last_char();
use_current_char = true;
}
break;
@@ -326,7 +323,6 @@
}
t_month = month_type(mr.current_match);
if (mr.has_remaining()) {
- current_char = mr.last_char();
use_current_char = true;
}
break;
@@ -342,7 +338,6 @@
}
t_month = month_type(mr.current_match);
if (mr.has_remaining()) {
- current_char = mr.last_char();
use_current_char = true;
}
break;
@@ -438,7 +433,6 @@
itr++;
if (use_current_char) {
use_current_char = false;
- current_char = *sitr;
}
else {
sitr++;
$ svn diff trunk/boost/date_time/format_date_parser.hpp -r 80699
$
-- Marshall
Marshall Clow Idio Software <mailto:mclow.lists_at_[hidden]>
A.D. 1517: Martin Luther nails his 95 Theses to the church door and is promptly moderated down to (-1, Flamebait).
-- Yu Suzuki
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk