You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Mark Phippard <ma...@gmail.com> on 2008/03/04 21:23:28 UTC
svn log -g problems
This is using trunk @ r29694 against our "special" 1.5 repository URL
(http://svn.collab.net/repos/svn.1.5)
I believe that this repository has mergeinfo set properly using that
svnsync tool that Mike P created. Meaning he created mergeinfo as
part of the svnsync process so that we would have mergeinfo to support
the -g options.
Some problems:
svn log -g --stop-on-copy http://svn.collab.net/repos/svn.1.5/branches/1.5.x
This command stops outputting the -g stuff after the first revision.
I reported this one a while back too.
svn log -g -r29649:29689 http://svn.collab.net/repos/svn.1.5/branches/1.5.x
This gives no output at all. Removing the -g works fine. Reversing
the revision numbers and leaving the -g also works, except there is no
"-g" output included.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn log -g problems
Posted by Mark Phippard <ma...@gmail.com>.
On Tue, Mar 4, 2008 at 8:40 PM, C. Michael Pilato <cm...@collab.net> wrote:
> Mark Phippard wrote:
> > svn log -g -r29649:29689 http://svn.collab.net/repos/svn.1.5/branches/1.5.x
> >
> > This gives no output at all. Removing the -g works fine. Reversing
> > the revision numbers and leaving the -g also works, except there is no
> > "-g" output included.
>
> No, reversing the revision numbers does include -g output. See r29671 in
> the output below?
>
> $ svn log -r29689:29649 http://svn.collab.net/repos/svn.1.5/branches/1.5.x -gq
> ------------------------------------------------------------------------
> r29689 | hwright | 2008-03-03 21:15:10 -0500 (Mon, 03 Mar 2008)
> ------------------------------------------------------------------------
> r29671 | cmpilato | 2008-03-03 11:35:14 -0500 (Mon, 03 Mar 2008)
> Merged via: r29689
I thought this might be the case, but did not go back and look.
Basically it is the same problem as the other where it only shows
once.
> I notice that there appear to be three merges in the specified range, but
> only one of them is a merge of revisions also in the specified range. Is
> this reflected in the output above? Meaning, are we only seeing the one -g
> revision (r29671) because the other merges are of revisions earlier than r29649?
I thought of that too, and it is possible that is related. However, I
have been seeing this problem of only showing once when doing a 0:HEAD
log as well as the --stop-on-copy.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn log -g problems
Posted by "C. Michael Pilato" <cm...@collab.net>.
Mark Phippard wrote:
> svn log -g -r29649:29689 http://svn.collab.net/repos/svn.1.5/branches/1.5.x
>
> This gives no output at all. Removing the -g works fine. Reversing
> the revision numbers and leaving the -g also works, except there is no
> "-g" output included.
No, reversing the revision numbers does include -g output. See r29671 in
the output below?
$ svn log -r29689:29649 http://svn.collab.net/repos/svn.1.5/branches/1.5.x -gq
------------------------------------------------------------------------
r29689 | hwright | 2008-03-03 21:15:10 -0500 (Mon, 03 Mar 2008)
------------------------------------------------------------------------
r29671 | cmpilato | 2008-03-03 11:35:14 -0500 (Mon, 03 Mar 2008)
Merged via: r29689
------------------------------------------------------------------------
r29676 | lgo | 2008-03-03 12:42:01 -0500 (Mon, 03 Mar 2008)
------------------------------------------------------------------------
r29675 | lgo | 2008-03-03 12:38:27 -0500 (Mon, 03 Mar 2008)
------------------------------------------------------------------------
r29673 | cmpilato | 2008-03-03 11:51:17 -0500 (Mon, 03 Mar 2008)
------------------------------------------------------------------------
r29670 | cauchy | 2008-03-03 03:40:24 -0500 (Mon, 03 Mar 2008)
------------------------------------------------------------------------
r29668 | joeswatosh | 2008-03-02 13:25:39 -0500 (Sun, 02 Mar 2008)
------------------------------------------------------------------------
r29661 | markphip | 2008-03-01 08:38:17 -0500 (Sat, 01 Mar 2008)
------------------------------------------------------------------------
r29657 | kfogel | 2008-02-29 22:34:48 -0500 (Fri, 29 Feb 2008)
------------------------------------------------------------------------
r29655 | hwright | 2008-02-29 22:16:47 -0500 (Fri, 29 Feb 2008)
------------------------------------------------------------------------
r29654 | hwright | 2008-02-29 22:15:19 -0500 (Fri, 29 Feb 2008)
------------------------------------------------------------------------
r29653 | hwright | 2008-02-29 22:13:59 -0500 (Fri, 29 Feb 2008)
------------------------------------------------------------------------
r29652 | hwright | 2008-02-29 22:13:03 -0500 (Fri, 29 Feb 2008)
------------------------------------------------------------------------
r29651 | markphip | 2008-02-29 21:15:51 -0500 (Fri, 29 Feb 2008)
------------------------------------------------------------------------
r29649 | kfogel | 2008-02-29 20:38:03 -0500 (Fri, 29 Feb 2008)
------------------------------------------------------------------------
$
I notice that there appear to be three merges in the specified range, but
only one of them is a merge of revisions also in the specified range. Is
this reflected in the output above? Meaning, are we only seeing the one -g
revision (r29671) because the other merges are of revisions earlier than r29649?
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn log -g problems
Posted by "C. Michael Pilato" <cm...@collab.net>.
C. Michael Pilato wrote:
> Mark Phippard wrote:
>> On Mon, Mar 10, 2008 at 11:53 AM, Mark Phippard <ma...@gmail.com>
>> wrote:
>>
>>> I saw you committed something, but the behavior seems the same for me.
>>> At least in the sense that when running the API over a range only the
>>> first item that was a merge returns mergeinfo output. For example, I
>>> have the 1.5 branch built @ r29823 (current HEAD). If I run this
>>> command on that working copy:
>>
>> Just as a followup, I have a repository I access via ra_local that
>> does seem to show mergeinfo beyond the first merge. So maybe this is
>> a problem via certain ra methods.
>>
>> I also notice that the merged revisions seem to count towards the
>> --limit, and I do not think they should. I imagine that is debatable,
>> but I only expect --limit to apply to the "main revisions".
>
> Here's what I get running ra-neon, ra-local, and ra-serf against my
> local sync of our repository: http://paste.lisp.org/display/57133
I've failed to determine -- even under a debugger -- why 'svn log -g' is
trying to lookup history for a non-existent path. But with a local mirror
of our source code repository, it's pretty easy to trigger the error:
svn log -vq -g --limit 20 \
file:///usr/local/svn/subversion/branches/1.5.x@29768
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn log -g problems
Posted by "C. Michael Pilato" <cm...@collab.net>.
Mark Phippard wrote:
> On Mon, Mar 10, 2008 at 11:53 AM, Mark Phippard <ma...@gmail.com> wrote:
>
>> I saw you committed something, but the behavior seems the same for me.
>> At least in the sense that when running the API over a range only the
>> first item that was a merge returns mergeinfo output. For example, I
>> have the 1.5 branch built @ r29823 (current HEAD). If I run this
>> command on that working copy:
>
> Just as a followup, I have a repository I access via ra_local that
> does seem to show mergeinfo beyond the first merge. So maybe this is
> a problem via certain ra methods.
>
> I also notice that the merged revisions seem to count towards the
> --limit, and I do not think they should. I imagine that is debatable,
> but I only expect --limit to apply to the "main revisions".
Here's what I get running ra-neon, ra-local, and ra-serf against my local
sync of our repository: http://paste.lisp.org/display/57133
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn log -g problems
Posted by Mark Phippard <ma...@gmail.com>.
On Mon, Mar 10, 2008 at 11:53 AM, Mark Phippard <ma...@gmail.com> wrote:
> I saw you committed something, but the behavior seems the same for me.
> At least in the sense that when running the API over a range only the
> first item that was a merge returns mergeinfo output. For example, I
> have the 1.5 branch built @ r29823 (current HEAD). If I run this
> command on that working copy:
Just as a followup, I have a repository I access via ra_local that
does seem to show mergeinfo beyond the first merge. So maybe this is
a problem via certain ra methods.
I also notice that the merged revisions seem to count towards the
--limit, and I do not think they should. I imagine that is debatable,
but I only expect --limit to apply to the "main revisions".
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn log -g problems
Posted by Mark Phippard <ma...@gmail.com>.
On Wed, Mar 5, 2008 at 4:45 PM, Hyrum K. Wright
<hy...@mail.utexas.edu> wrote:
> Mark Phippard wrote:
> > This is using trunk @ r29694 against our "special" 1.5 repository URL
> > (http://svn.collab.net/repos/svn.1.5)
> >
> > I believe that this repository has mergeinfo set properly using that
> > svnsync tool that Mike P created. Meaning he created mergeinfo as
> > part of the svnsync process so that we would have mergeinfo to support
> > the -g options.
> >
> > Some problems:
> >
> > svn log -g --stop-on-copy http://svn.collab.net/repos/svn.1.5/branches/1.5.x
> >
> > This command stops outputting the -g stuff after the first revision.
> > I reported this one a while back too.
>
> Hmm, that's...interesting. I'll take a look at it.
I saw you committed something, but the behavior seems the same for me.
At least in the sense that when running the API over a range only the
first item that was a merge returns mergeinfo output. For example, I
have the 1.5 branch built @ r29823 (current HEAD). If I run this
command on that working copy:
svn log -g limit 20
This is the revision output I get.
r29823 | pburba | 2008-03-10 11:39:33 -0400 (Mon, 10 Mar 2008) | 3 lines
r29810 | arfrever | 2008-03-09 08:47:39 -0400 (Sun, 09 Mar 2008) | 5 lines
r29808 | cauchy | 2008-03-09 04:09:22 -0400 (Sun, 09 Mar 2008) | 4 lines
r29791 | pburba | 2008-03-07 18:22:06 -0500 (Fri, 07 Mar 2008) | 1 line
r29763 | hwright | 2008-03-07 00:16:10 -0500 (Fri, 07 Mar 2008) | 12 lines
Merged via: r29791
r29790 | pburba | 2008-03-07 18:21:10 -0500 (Fri, 07 Mar 2008) | 2 lines
r29788 | pburba | 2008-03-07 17:50:44 -0500 (Fri, 07 Mar 2008) | 2 lines
r29785 | cmpilato | 2008-03-07 15:46:35 -0500 (Fri, 07 Mar 2008) | 1 line
r29783 | cmpilato | 2008-03-07 15:17:39 -0500 (Fri, 07 Mar 2008) | 13 lines
r29782 | cmpilato | 2008-03-07 15:15:25 -0500 (Fri, 07 Mar 2008) | 12 lines
r29781 | cmpilato | 2008-03-07 15:08:32 -0500 (Fri, 07 Mar 2008) | 11 lines
r29780 | cmpilato | 2008-03-07 14:51:15 -0500 (Fri, 07 Mar 2008) | 13 lines
r29779 | cmpilato | 2008-03-07 14:48:26 -0500 (Fri, 07 Mar 2008) | 13 lines
r29778 | hwright | 2008-03-07 14:47:40 -0500 (Fri, 07 Mar 2008) | 2 lines
A couple of interesting points:
1) Only the first revision that is a merge r29791 shows the merged revision.
2) There are only 15 items total that are output. 14 from the request
path, plus the one merged revision. I thought that maybe the other 5
were merged revisions that did not show up, but in fact there are
about 8-9 more revisions that should have shown up.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn log -g problems
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Mark Phippard wrote:
> This is using trunk @ r29694 against our "special" 1.5 repository URL
> (http://svn.collab.net/repos/svn.1.5)
>
> I believe that this repository has mergeinfo set properly using that
> svnsync tool that Mike P created. Meaning he created mergeinfo as
> part of the svnsync process so that we would have mergeinfo to support
> the -g options.
>
> Some problems:
>
> svn log -g --stop-on-copy http://svn.collab.net/repos/svn.1.5/branches/1.5.x
>
> This command stops outputting the -g stuff after the first revision.
> I reported this one a while back too.
Hmm, that's...interesting. I'll take a look at it.
> svn log -g -r29649:29689 http://svn.collab.net/repos/svn.1.5/branches/1.5.x
>
> This gives no output at all. Removing the -g works fine. Reversing
> the revision numbers and leaving the -g also works, except there is no
> "-g" output included.
This should be fixed in r29738.
-Hyrum