arsenm2@xxxxxxxxx wrote on Wed, 24 Oct 2012 19:41 -0700:
>
> On Oct 21, 2012, at 12:06 , Junio C Hamano <gitster@xxxxxxxxx> wrote:
> >
> >>
> >> This solves errors in some cases when syncing renamed files.
> >
> > Can you be a bit more descriptive? What are "errors in some case"?
> >
> It might just be when files are renamed. I ran into this after months of using it, and I'm skeptical that in that time no files were ever renamed. I'm not sure what was special about the file that was renamed. (There also might have been deleted files in the same commit, not sure if that matters)
I set up a test case where I did a "p4 move" on a file and tried
syncing it, with and without "-s" to describe. It works in both
cases, for an old (2009.2) and new (2012.1) version of p4.
The output of -s versus no -s does differ, and the differences
are different with server version worse yet. But in no case is
there ever a set of file differences. -G does seem to disable
that.
I'd love to track this down, but can't seem to provoke anything
on my own. Let me know if you have any hints based on what is in
your depot or server/client config. Or if you see it again.
> > In short, what I am getting at are:
> >
> > - What breaks by not passing "-s"? What are the user visible
> > symptoms?
>
> There's a key error on the line
> line 2198: epoch = details["time"]
> The details object is an error different fields set (I don't remember what it is exactly, I'm not at work right now)
This would happen if describe did not return a "time" field, but
there's an explicit check for that:
res = p4CmdList("describe -s %d" % newestRevision)
newestTime = None
for r in res:
if r.has_key('time'):
newestTime = int(r['time'])
if newestTime is None:
die("Output from \"describe -s\" on newest change %d did not give a time" %
newestRevision)
details["time"] = newestTime
so I'm confused how this could happen. Maybe your version is
older/different than what is in the git source?
I'm not against putting in your patch, since it is true we don't
want the file diff, and adding "-s" should be harmless in theory.
And it doesn't cause any existing tests to fail. It just scares
me that there's something else going on we haven't figured out.
-- Pete
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html