You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Marc Singer <el...@buici.com> on 2003/08/30 16:59:44 UTC
How does log translate to diff
I'm trying to understand how I can interpret log entries and fetch
diffs accordingly.
Here is what the log says:
elf@florence ~...coastal/src > svn log file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
------------------------------------------------------------------------
rev 1163: unknown | 2003-08-29 14:50:15 -0700 (Fri, 29 Aug 2003) | 1 line
This commit was manufactured by cvs2svn to create tag 'V_0_81'.
------------------------------------------------------------------------
rev 831: elf | 2002-09-30 09:07:03 -0700 (Mon, 30 Sep 2002) | 2 lines
Adding support for GCC3.2
I'd interpret this to mean that one line changed between these two
revisions. However, when I ask for a diff, I don't get what I expect.
> svn diff -r831:1163 file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
Index: GNUmakefile.rules.in
===================================================================
--- GNUmakefile.rules.in (revision 0)
+++ GNUmakefile.rules.in (revision 1163)
@@ -0,0 +1,249 @@
+# GNUmakefile.rules -*- Makefile -*-
+# $Id: GNUmakefile.rules.in,v 1.6 2002/09/30 16:07:03 elf Exp $
+#
+# NOTES
+# -----
Why does svn pull the base revision as 0 when the diff command
requests otherwise?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How does log translate to diff
Posted by Marc Singer <el...@buici.com>.
On Tue, Sep 02, 2003 at 12:32:35PM -0700, Jack Repenning wrote:
> At 9:59 AM -0700 8/30/03, Marc Singer wrote:
> >I'm trying to understand how I can interpret log entries and fetch
> >diffs accordingly.
> >
> >Here is what the log says:
> >
> > elf@florence ~...coastal/src > svn log
> >file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
> > ------------------------------------------------------------------------
> > rev 1163: unknown | 2003-08-29 14:50:15 -0700 (Fri, 29 Aug 2003) | 1
> > line
> >
> > This commit was manufactured by cvs2svn to create tag 'V_0_81'.
> > ------------------------------------------------------------------------
> > rev 831: elf | 2002-09-30 09:07:03 -0700 (Mon, 30 Sep 2002) | 2 lines
> >
> > Adding support for GCC3.2
> >
> >I'd interpret this to mean that one line changed between these two
> >revisions.
>
> I think the "1 line" thing is just bogus. I always seem to get that
> claim, no matter how much change has occurred.
Could it be an $Id$ line?
> >However, when I ask for a diff, I don't get what I expect.
> >
> > > svn diff -r831:1163
> >file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
> >
> > Index: GNUmakefile.rules.in
> > ===================================================================
> > --- GNUmakefile.rules.in (revision 0)
>
> That part's surprising.
Indeed.
> > +++ GNUmakefile.rules.in (revision 1163)
> > @@ -0,0 +1,249 @@
> > +# GNUmakefile.rules -*- Makefile -*-
> > +# $Id: GNUmakefile.rules.in,v 1.6 2002/09/30 16:07:03 elf Exp $
> > +#
> > +# NOTES
> > +# -----
>
> Could it be that this really is the change made at rev 1163 (given my
> claim that the "1" claim is just bogus)?
I don't think so. I've very keen to use subversion, so I'm innundated
with unexpected results. I plan to get back to this problem after
I've resolved a few others. I'll keep the list posted.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How does log translate to diff
Posted by kf...@collab.net.
Jack Repenning <jr...@collab.net> writes:
> >I'd interpret this to mean that one line changed between these two
> >revisions.
>
> I think the "1 line" thing is just bogus. I always seem to get that
> claim, no matter how much change has occurred.
It gives the number of lines in the log message, not the number of
lines in the change. (It's to help auto-parsing of the log message.)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How does log translate to diff
Posted by Jack Repenning <jr...@collab.net>.
At 9:59 AM -0700 8/30/03, Marc Singer wrote:
>I'm trying to understand how I can interpret log entries and fetch
>diffs accordingly.
>
>Here is what the log says:
>
> elf@florence ~...coastal/src > svn log
>file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
> ------------------------------------------------------------------------
> rev 1163: unknown | 2003-08-29 14:50:15 -0700 (Fri, 29 Aug 2003) | 1 line
>
> This commit was manufactured by cvs2svn to create tag 'V_0_81'.
> ------------------------------------------------------------------------
> rev 831: elf | 2002-09-30 09:07:03 -0700 (Mon, 30 Sep 2002) | 2 lines
>
> Adding support for GCC3.2
>
>I'd interpret this to mean that one line changed between these two
>revisions.
I think the "1 line" thing is just bogus. I always seem to get that
claim, no matter how much change has occurred.
>However, when I ask for a diff, I don't get what I expect.
>
> > svn diff -r831:1163
>file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
>
> Index: GNUmakefile.rules.in
> ===================================================================
> --- GNUmakefile.rules.in (revision 0)
That part's surprising.
> +++ GNUmakefile.rules.in (revision 1163)
> @@ -0,0 +1,249 @@
> +# GNUmakefile.rules -*- Makefile -*-
> +# $Id: GNUmakefile.rules.in,v 1.6 2002/09/30 16:07:03 elf Exp $
> +#
> +# NOTES
> +# -----
Could it be that this really is the change made at rev 1163 (given my
claim that the "1" claim is just bogus)?
--
-==-
Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
o: 650.228.2562
c: 408.835-8090
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How does log translate to diff
Posted by kf...@collab.net.
Marc Singer <el...@buici.com> writes:
> OK. But why does it generate a diff betwee revision 0 and revision 1163?
That sounds like just a bug, and a serious one too. (By the way, it
would help to include the relevant context from your original mail --
I happeed to still have a copy, so I went back and looked at it.)
Have you determined that the diff is actually between r0 and r1163, or
is it just a matter of the diff labels being incorrect (i.e., it
claims to be from r0 to r1163, but in fact it shows the difference
between r831 and r1163)?
Either way it's still a bug, but the first way would be a more severe
bug. If you could file an issue, ideally with a reproduction case,
that would be great. If you can't construct a reproduction case, but
your current repository is not private, then we can just use that
data.
Of course, all this assumes that you're encountering the bug with the
latest Subversion, 0.28.2... Oh, which has apparently not gotten to
the end of the release process yet. Well, just update to HEAD of
Subversion and use that. (If you were running 0.27 or lower, this may
involve a repository dump and load, see
http://subversion.tigris.org/project_faq.html#dumpload).
Below I've included the context from your original mail, so it's clear
to others what we're talking about.
-Karl
> Here is what the log says:
>
> elf@florence ~...coastal/src > svn log file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
> ------------------------------------------------------------------------
> rev 1163: unknown | 2003-08-29 14:50:15 -0700 (Fri, 29 Aug 2003) | 1 line
>
> This commit was manufactured by cvs2svn to create tag 'V_0_81'.
> ------------------------------------------------------------------------
> rev 831: elf | 2002-09-30 09:07:03 -0700 (Mon, 30 Sep 2002) | 2 lines
>
> Adding support for GCC3.2
>
> I'd interpret this to mean that one line changed between these two
> revisions. However, when I ask for a diff, I don't get what I expect.
>
> > svn diff -r831:1163 file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
>
> Index: GNUmakefile.rules.in
> ===================================================================
> --- GNUmakefile.rules.in (revision 0)
> +++ GNUmakefile.rules.in (revision 1163)
> @@ -0,0 +1,249 @@
> +# GNUmakefile.rules -*- Makefile -*-
> +# $Id: GNUmakefile.rules.in,v 1.6 2002/09/30 16:07:03 elf Exp $
> +#
> +# NOTES
> +# -----
>
> Why does svn pull the base revision as 0 when the diff command
> requests otherwise?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How does log translate to diff
Posted by kf...@collab.net.
Marc Singer <el...@buici.com> writes:
> elf@florence ~...coastal/src > svn log file:///svn/coastal/tags/V_0_81/build/GNUmakefile.rules.in
> ------------------------------------------------------------------------
> rev 1163: unknown | 2003-08-29 14:50:15 -0700 (Fri, 29 Aug 2003) | 1 line
>
> This commit was manufactured by cvs2svn to create tag 'V_0_81'.
> ------------------------------------------------------------------------
> rev 831: elf | 2002-09-30 09:07:03 -0700 (Mon, 30 Sep 2002) | 2 lines
>
> Adding support for GCC3.2
>
> I'd interpret this to mean that one line changed between these two
> revisions. However, when I ask for a diff, I don't get what I expect.
The line count refers to the number of lines in the log message, not
the number of lines in the diff. (The line count is there so tools
will have an easier time automatically parsing log messages.)
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org