You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Thomas S. Trias" <to...@artizan.com> on 2010/03/15 15:48:13 UTC
Log excluding svn:mergeinfo changes
Is there a good way to get the log for a path excluding changes that
only affected svn:mergeinfo? We have a project with several one-off
copies of files, where changes to the copyfrom-path get merged in
periodically. We then have a feature branch that gets merges from
trunk. When we merge to the feature branch, the one-offs get updated
svn:mergeinfo since they already have the svn:mergeinfo from the
copyfrom-path. Because of this, svn ls, svn info, and svn log show the
path for revisions where only the svn:mergeinfo changed; svn ls and svn
info become useless for finding the latest revision for a path.
In order to get around this, we end up performing multiple svn diffs (a
summarize of repo@rev to keep paths with text changes followed by a diff
per path to determine if the only property change was to
svn:mergeinfo). Luckily, the information can be cached once computed.
While the decision to use a standard property for svn:mergeinfo is an
elegant solution in terms of using functionality already available, it
has awkward side-effects like the one mentioned above. Since it is a
special property (as now reflected by options that follow merge
history), it would be nice to also have options to ignore the property
for the purposes of log, info, diff, ls, etc. Maybe this already exists
and I'm missing something?
Thanks,
--
Thomas S. Trias
Senior Developer
Artizan Internet Services
http://www.artizan.com/
Re: Log excluding svn:mergeinfo changes
Posted by Stefan Sperling <st...@elego.de>.
On Wed, Mar 17, 2010 at 10:54:29AM -0500, Thomas S. Trias wrote:
> I will gladly lend time and energy as available; I envision even
> more affected commands, such as info and ls for their last committed
> revision calculation.
Great, that's very much appreciated!
If you haven't done so, you might want to peek into the community
guide for pointers about starting to contribute:
http://subversion.apache.org/docs/community-guide/
If you have questions, just ask! If you have patches, please send them.
Even if you don't feel confident about your patches at first, showing
them to developers and digesting feedback will help you become confident
about them quickly.
Thanks,
Stefan
Re: Log excluding svn:mergeinfo changes
Posted by "Thomas S. Trias" <to...@artizan.com>.
I will gladly lend time and energy as available; I envision even more
affected commands, such as info and ls for their last committed revision
calculation.
Thanks,
Thomas S. Trias
Senior Developer
Artizan Internet Services
http://www.artizan.com/
-------- Original Message --------
Subject: Re: Log excluding svn:mergeinfo changes
From: Stefan Sperling <st...@elego.de>
To: eg <eg...@gmail.com>
Cc: "Thomas S. Trias" <to...@artizan.com>, users@subversion.apache.org
Date: 3/17/2010 5:05 AM
> On Tue, Mar 16, 2010 at 05:26:47PM -0700, eg wrote:
>
>> On 3/15/2010 9:12 AM, Stefan Sperling wrote:
>>
>>
>>> There is an experimental branch which is aimed at implementing
>>> what you need:
>>> http://svn.apache.org/repos/asf/subversion/branches/ignore-mergeinfo/BRANCH-README
>>>
>>> I don't know what the status of this branch is, though.
>>> It looks like work on it has been suspended, possibly because
>>> Hyrum (who started this branch) is uber-busy with the ongoing
>>> working copy implementation re-write and other duties.
>>>
>>>
>> I wonder if that might be a good candidate for a Google summer of
>> code project?
>>
>
> Yes! Thanks for pointing that out. (I am looking for gsoc project
> ideas but couldn't see the forrest for the trees with this one...)
>
>
>
Re: Log excluding svn:mergeinfo changes
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Mar 16, 2010 at 05:26:47PM -0700, eg wrote:
> On 3/15/2010 9:12 AM, Stefan Sperling wrote:
>
> >There is an experimental branch which is aimed at implementing
> >what you need:
> >http://svn.apache.org/repos/asf/subversion/branches/ignore-mergeinfo/BRANCH-README
> >
> >I don't know what the status of this branch is, though.
> >It looks like work on it has been suspended, possibly because
> >Hyrum (who started this branch) is uber-busy with the ongoing
> >working copy implementation re-write and other duties.
> >
>
> I wonder if that might be a good candidate for a Google summer of
> code project?
Yes! Thanks for pointing that out. (I am looking for gsoc project
ideas but couldn't see the forrest for the trees with this one...)
Re: Log excluding svn:mergeinfo changes
Posted by eg <eg...@gmail.com>.
On 3/15/2010 9:12 AM, Stefan Sperling wrote:
> There is an experimental branch which is aimed at implementing
> what you need:
> http://svn.apache.org/repos/asf/subversion/branches/ignore-mergeinfo/BRANCH-README
>
> I don't know what the status of this branch is, though.
> It looks like work on it has been suspended, possibly because
> Hyrum (who started this branch) is uber-busy with the ongoing
> working copy implementation re-write and other duties.
>
I wonder if that might be a good candidate for a Google summer of code
project?
Re: Log excluding svn:mergeinfo changes
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Mar 15, 2010 at 10:48:13AM -0500, Thomas S. Trias wrote:
> Is there a good way to get the log for a path excluding changes that
> only affected svn:mergeinfo? We have a project with several one-off
> copies of files, where changes to the copyfrom-path get merged in
> periodically. We then have a feature branch that gets merges from
> trunk. When we merge to the feature branch, the one-offs get
> updated svn:mergeinfo since they already have the svn:mergeinfo from
> the copyfrom-path. Because of this, svn ls, svn info, and svn log
> show the path for revisions where only the svn:mergeinfo changed;
> svn ls and svn info become useless for finding the latest revision
> for a path.
>
> In order to get around this, we end up performing multiple svn diffs
> (a summarize of repo@rev to keep paths with text changes followed by
> a diff per path to determine if the only property change was to
> svn:mergeinfo). Luckily, the information can be cached once
> computed.
>
> While the decision to use a standard property for svn:mergeinfo is
> an elegant solution in terms of using functionality already
> available, it has awkward side-effects like the one mentioned above.
> Since it is a special property (as now reflected by options that
> follow merge history), it would be nice to also have options to
> ignore the property for the purposes of log, info, diff, ls, etc.
> Maybe this already exists and I'm missing something?
There is an experimental branch which is aimed at implementing
what you need:
http://svn.apache.org/repos/asf/subversion/branches/ignore-mergeinfo/BRANCH-README
I don't know what the status of this branch is, though.
It looks like work on it has been suspended, possibly because
Hyrum (who started this branch) is uber-busy with the ongoing
working copy implementation re-write and other duties.
Stefan