You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Marc Strapetz <ma...@syntevo.com> on 2007/08/23 11:41:08 UTC
log -g shows only one log-subtree in case of multiple, independent
merges
When committing one revision with two different, independent merges, log
-g shows only one of these subtrees, however I would expect to see both
of them. Example (for I can supply corresponding test repository):
/trunk/dir1/file1 merged from /branches/b1
(svn:mergeinfo : /branches/b15/dir1:17-20)
/trunk/dir2/file2 merged from /branches/b2
(svn:mergeinfo : /branches/b18/dir2:20)
After committing /trunk to r21, svn log -g /trunk shows only
r21 (merge)
r20 (Result of merge from: r21)
r17 (some other changes)
...
However, svn log -g /trunk/dir1 shows (as expected):
r21 (merge)
r18 (Result of merge from: r21)
r17 (some other changes)
...
and svn log -g /trunk/dir2 shows (as expected):
r21 (merge)
r20 (Result of merge from: r21)
r14 (some other changes)
...
Shouldn't r18 also be displayed for svn log -g /trunk?
--
Best regards,
Marc Strapetz
_____________
syntevo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: log -g shows only one log-subtree in case of multiple, independent
merges
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Marc Strapetz wrote:
> Hello Hyrum,
>
>> If one committed revision contains multiple merges, they should indeed
>> both show up in 'svn log -g'. Would you file a bug on this issue, and
>> include your reproduction recipe and sample repository?
>
> It's issue #2905.
Thanks!
- -Hyrum
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFG3GNSCwOubk4kUXwRAi+2AJ4yyAV94JcBqWUFBxrsUnooJiIo+ACZAZOi
YA51ruHxoPZ+RiWhMqoS1tc=
=nrBB
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: log -g shows only one log-subtree in case of multiple, independent
merges
Posted by Marc Strapetz <ma...@syntevo.com>.
Hello Hyrum,
> If one committed revision contains multiple merges, they should indeed
> both show up in 'svn log -g'. Would you file a bug on this issue, and
> include your reproduction recipe and sample repository?
It's issue #2905.
--
Best regards,
Marc Strapetz
_____________
syntevo.com
Hyrum K. Wright wrote:
> Marc Strapetz wrote:
>> When committing one revision with two different, independent merges, log
>> -g shows only one of these subtrees, however I would expect to see both
>> of them. Example (for I can supply corresponding test repository):
>
>> /trunk/dir1/file1 merged from /branches/b1
>> (svn:mergeinfo : /branches/b15/dir1:17-20)
>
>> /trunk/dir2/file2 merged from /branches/b2
>> (svn:mergeinfo : /branches/b18/dir2:20)
>
>> After committing /trunk to r21, svn log -g /trunk shows only
>
>> r21 (merge)
>> r20 (Result of merge from: r21)
>> r17 (some other changes)
>> ...
>
>> However, svn log -g /trunk/dir1 shows (as expected):
>> r21 (merge)
>> r18 (Result of merge from: r21)
>> r17 (some other changes)
>> ...
>
>> and svn log -g /trunk/dir2 shows (as expected):
>> r21 (merge)
>> r20 (Result of merge from: r21)
>> r14 (some other changes)
>> ...
>
>> Shouldn't r18 also be displayed for svn log -g /trunk?
>
>> --
>
> Marc,
> If one committed revision contains multiple merges, they should indeed
> both show up in 'svn log -g'. Would you file a bug on this issue, and
> include your reproduction recipe and sample repository?
>
> Thanks,
> -Hyrum
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: log -g shows only one log-subtree in case of multiple, independent
merges
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Marc Strapetz wrote:
> When committing one revision with two different, independent merges, log
> -g shows only one of these subtrees, however I would expect to see both
> of them. Example (for I can supply corresponding test repository):
>
> /trunk/dir1/file1 merged from /branches/b1
> (svn:mergeinfo : /branches/b15/dir1:17-20)
>
> /trunk/dir2/file2 merged from /branches/b2
> (svn:mergeinfo : /branches/b18/dir2:20)
>
> After committing /trunk to r21, svn log -g /trunk shows only
>
> r21 (merge)
> r20 (Result of merge from: r21)
> r17 (some other changes)
> ...
>
> However, svn log -g /trunk/dir1 shows (as expected):
> r21 (merge)
> r18 (Result of merge from: r21)
> r17 (some other changes)
> ...
>
> and svn log -g /trunk/dir2 shows (as expected):
> r21 (merge)
> r20 (Result of merge from: r21)
> r14 (some other changes)
> ...
>
> Shouldn't r18 also be displayed for svn log -g /trunk?
>
> --
Marc,
If one committed revision contains multiple merges, they should indeed
both show up in 'svn log -g'. Would you file a bug on this issue, and
include your reproduction recipe and sample repository?
Thanks,
- -Hyrum
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFG1A5OCwOubk4kUXwRAropAJwLp7ECdnk/feLDIzigPoMCQXgLTgCfWXvh
2X8fN6OXMXKe57OBCVFW0GE=
=vn9g
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org