Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Re: fsvs bails out

fsvs
Discussion topic

Back to topic list

Re: fsvs bails out

Author pmarek
Full name P.Marek
Date 2006-03-25 03:39:42 PST
Message On Saturday 25 March 2006 11:00 Gunter Ohrner wrote:
> (Posting to dev at fsvs dot tigris dot org with a private copy to Philipp, as I don't
> know how long my subscription request to the ML will need to get through
> and if the ML rejects non-subscriber mails.)
dev@ and users@ are open, only announce@ is moderated.

> The problem might not be in fsvs because I tried to reuse a repository
> previously managed with a meta-data patched regular svn client. The error
> happened while checking out the existing repository into an empty test
> directory using "sync-repos". fsvs seems to choke on the timestamp of
> some files.
>
> I also sometimes gut problems with timestamps using the svn meta-data
> patch, so the bug may very well be a plain user error or in this patch.
> However, fsvs (as well as the svn meta-data patch) should probably allow
> a checkout of files even if they consider the timestamp to be invalid...
>
> The problem is that somehoiw a verbatim "svn:text-time : yes" seems to
> have been comitted for the directory misc/prog/openwrt/re​pos/db/revs/358
> (Which probably IS a user error... :-/ ), which obviously is not a valid
> time stamp.
Try this patch.

I'll do some kind of warning-system ASAP.


Thank you for reporting this problem, please do so in the future, too :-)


Regards,

Phil


diff -uw update.c update.c.new
--- update.c 2006-03-25 12:37:53.000000000 +0100
+++ update.c.new 2006-03-25 12:37:18.000000000 +0100
@@ -72,9 +72,11 @@
                /* for user and group we try to find the username, and
fallback
                 * to the uid. */
                i=strtoul(value->data, &cp, 0);
- STOPIF_CODE_ERR( cp == value->data, EINVAL,
- "cannot read uid in %s", value->data);
-
+ if (cp == value->data)
+ {
+ }
+ else
+ {
                while (*cp && isspace(*cp)) cp++;
                if (*cp)
                {
@@ -88,12 +90,15 @@
                DEBUGP("marking owner %s to %d",
                                value->data, sts->st.st_uid);
        }
+ }
        else if (0 == strcmp(name, propname_group))
        {
                i=strtoul(value->data, &cp, 0);
- STOPIF_CODE_ERR( cp == value->data, EINVAL,
- "cannot read gid in %s", value->data);
-
+ if (cp == value->data)
+ {
+ }
+ else
+ {
                while (*cp && isspace(*cp)) cp++;
                if (*cp)
                {
@@ -107,11 +112,11 @@
                DEBUGP("marking group %s to %d",
                                value->data, sts->st.st_gid);
        }
+ }
        else if (0 == strcmp(name, propname_mtime))
        {
- STOPIF_SVNERR( svn_time_from_cstring,
- (&at, value->data, pool));
-
+ if (!svn_time_from_cstr​ing(&at, value->data, pool))
+ {
                sts->st.st_mtim.t​v_sec=apr_time_sec(a​t);
                sts->st.st_mtim.t​v_nsec=apr_time_usec​(at) * 1000;
                sts->entry_status |= FS_META_MTIME;
@@ -119,17 +124,21 @@
                                value->data,
                                ctime(& (sts->st.st_mtim.tv_sec) ));
        }
+ }
        else if (0 == strcmp(name, propname_umode))
        {
                i=strtoul(value->data, &cp, 0);
- STOPIF_CODE_ERR( *cp || i>07777, EINVAL,
- "no valid permissions found in %s",
value->data);
-
+ if (*cp || i>07777)
+ {
+ }
+ else
+ {
                sts->st.st_mode = (sts->st.st_mode & ~07777) | i;
                sts->entry_status |= FS_META_UMODE;
                DEBUGP("marking mode \"%s\" to 0%o",
                                value->data, sts->st.st_mode & 07777);
        }
+ }
        else if (0 == strcmp(name, propname_special) &&
                        0 == strcmp(value->data, propval_special))
        {

« Previous message in topic | 2 of 8 | Next message in topic »

Messages

Show all messages in topic

fsvs bails out Gunter Ohrner <G dot Ohrner at post dot rwth-aachen dot de> Gunter Ohrner <G dot Ohrner at post dot rwth-aachen dot de> 2006-03-25 02:00:00 PST
     Re: fsvs bails out pmarek P.Marek 2006-03-25 03:39:42 PST
         Re: fsvs bails out Gunter Ohrner <G dot Ohrner at post dot rwth-aachen dot de> Gunter Ohrner <G dot Ohrner at post dot rwth-aachen dot de> 2006-03-26 01:09:21 PST
             Re: fsvs bails out pmarek P.Marek 2006-03-26 05:08:23 PST
                 Re: fsvs bails out Gunter Ohrner <G dot Ohrner at post dot rwth-aachen dot de> Gunter Ohrner <G dot Ohrner at post dot rwth-aachen dot de> 2006-03-26 14:43:19 PST
                     Re: fsvs bails out pmarek P.Marek 2006-03-26 23:25:42 PST
                 Re: fsvs bails out Gunter Ohrner <G dot Ohrner at post dot rwth-aachen dot de> Gunter Ohrner <G dot Ohrner at post dot rwth-aachen dot de> 2006-03-27 10:22:33 PST
                     Re: fsvs bails out pmarek P.Marek 2006-03-29 08:11:38 PST
Messages per page: