You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tuscany.apache.org by kelvin goodson <kg...@thegoodsons.org.uk> on 2010/06/03 10:25:19 UTC
svn:merge and mergeinfo
When I do an svn:merge there are a host of files that I have not
modified that appear to need committing. I believe it is because they
have the svn:mergeinfo property set on them [1], To date I have
manually unselected these for commit, and reverted them after
committing my selected files. Can we remove this property everywhere
it occurs?
Kelvin.
[1] http://stackoverflow.com/questions/2051267/why-would-svn-merge-of-a-branch-with-no-changes-causes-untouched-files-to-modify
Re: svn:merge and mergeinfo
Posted by ant elder <an...@gmail.com>.
On Thu, Jun 3, 2010 at 11:02 AM, Simon Laws <si...@googlemail.com> wrote:
> On Thu, Jun 3, 2010 at 10:22 AM, kelvin goodson <kg...@thegoodsons.org.uk> wrote:
>> the post at [1] in about paragraph 5 has some useful insights --- I'm
>> still working through it, but others may be able to apply more
>> experience and tuscany history to these comments.
>>
>> Kelvin
>>
>> [1] http://chrisoldwood.blogspot.com/2010/03/cleaning-up-svnmergeinfo-droppings.html
>>
>>
>
> So this does appear to give some insight on how these seemingly
> arbitrary mergeinfo properties have come about, i.e. cherry picked
> changes in subdirectories. It also seems to suggest that removing all
> but the root mergeinfo property is a reasonable option.
>
> Simon
>
No one has commented saying they can see any problems with removing
the mergeinfo property so i think we should and will go look at how to
get it done.
...ant
Re: svn:merge and mergeinfo
Posted by Simon Laws <si...@googlemail.com>.
On Thu, Jun 3, 2010 at 10:22 AM, kelvin goodson <kg...@thegoodsons.org.uk> wrote:
> the post at [1] in about paragraph 5 has some useful insights --- I'm
> still working through it, but others may be able to apply more
> experience and tuscany history to these comments.
>
> Kelvin
>
> [1] http://chrisoldwood.blogspot.com/2010/03/cleaning-up-svnmergeinfo-droppings.html
>
>
So this does appear to give some insight on how these seemingly
arbitrary mergeinfo properties have come about, i.e. cherry picked
changes in subdirectories. It also seems to suggest that removing all
but the root mergeinfo property is a reasonable option.
Simon
--
Apache Tuscany committer: tuscany.apache.org
Co-author of a book about Tuscany and SCA: tuscanyinaction.com
Re: svn:merge and mergeinfo
Posted by kelvin goodson <kg...@thegoodsons.org.uk>.
the post at [1] in about paragraph 5 has some useful insights --- I'm
still working through it, but others may be able to apply more
experience and tuscany history to these comments.
Kelvin
[1] http://chrisoldwood.blogspot.com/2010/03/cleaning-up-svnmergeinfo-droppings.html
On Thu, Jun 3, 2010 at 9:58 AM, Simon Laws <si...@googlemail.com> wrote:
> On Thu, Jun 3, 2010 at 9:45 AM, ant elder <an...@gmail.com> wrote:
>> On Thu, Jun 3, 2010 at 9:25 AM, kelvin goodson <kg...@thegoodsons.org.uk> wrote:
>>> When I do an svn:merge there are a host of files that I have not
>>> modified that appear to need committing. I believe it is because they
>>> have the svn:mergeinfo property set on them [1], To date I have
>>> manually unselected these for commit, and reverted them after
>>> committing my selected files. Can we remove this property everywhere
>>> it occurs?
>>>
>>> Kelvin.
>>>
>>> [1] http://stackoverflow.com/questions/2051267/why-would-svn-merge-of-a-branch-with-no-changes-causes-untouched-files-to-modify
>>>
>>
>> Yes i find all the mergeinfo changes bothersome too so if it doesn't
>> cause any side effects (and it doesn't sound like it will from the
>> link you posted) then lets remove the property.
>>
>> ...ant
>>
>
>
> I see this too. I'm not really familar with the mergeinfo property.
> From the link it seems to be recording information about what has
> already been merged and from where. I would seem sensible to either
> configure and use it consistently or remove it.
>
> My initial reaction yesterday on running a merge was to look at
> committing the changes I was expecting and revert the numerous
> properties changes. I think that this means that I'm in favor of
> removing the properties. I'd just like to understand what we're
> missing by not having them before we finally commit to removal.
>
> Regards
>
> Simon
>
> --
> Apache Tuscany committer: tuscany.apache.org
> Co-author of a book about Tuscany and SCA: tuscanyinaction.com
>
Re: svn:merge and mergeinfo
Posted by Simon Laws <si...@googlemail.com>.
On Thu, Jun 3, 2010 at 9:45 AM, ant elder <an...@gmail.com> wrote:
> On Thu, Jun 3, 2010 at 9:25 AM, kelvin goodson <kg...@thegoodsons.org.uk> wrote:
>> When I do an svn:merge there are a host of files that I have not
>> modified that appear to need committing. I believe it is because they
>> have the svn:mergeinfo property set on them [1], To date I have
>> manually unselected these for commit, and reverted them after
>> committing my selected files. Can we remove this property everywhere
>> it occurs?
>>
>> Kelvin.
>>
>> [1] http://stackoverflow.com/questions/2051267/why-would-svn-merge-of-a-branch-with-no-changes-causes-untouched-files-to-modify
>>
>
> Yes i find all the mergeinfo changes bothersome too so if it doesn't
> cause any side effects (and it doesn't sound like it will from the
> link you posted) then lets remove the property.
>
> ...ant
>
I see this too. I'm not really familar with the mergeinfo property.
>From the link it seems to be recording information about what has
already been merged and from where. I would seem sensible to either
configure and use it consistently or remove it.
My initial reaction yesterday on running a merge was to look at
committing the changes I was expecting and revert the numerous
properties changes. I think that this means that I'm in favor of
removing the properties. I'd just like to understand what we're
missing by not having them before we finally commit to removal.
Regards
Simon
--
Apache Tuscany committer: tuscany.apache.org
Co-author of a book about Tuscany and SCA: tuscanyinaction.com
Re: svn:merge and mergeinfo
Posted by ant elder <an...@gmail.com>.
On Thu, Jun 3, 2010 at 9:25 AM, kelvin goodson <kg...@thegoodsons.org.uk> wrote:
> When I do an svn:merge there are a host of files that I have not
> modified that appear to need committing. I believe it is because they
> have the svn:mergeinfo property set on them [1], To date I have
> manually unselected these for commit, and reverted them after
> committing my selected files. Can we remove this property everywhere
> it occurs?
>
> Kelvin.
>
> [1] http://stackoverflow.com/questions/2051267/why-would-svn-merge-of-a-branch-with-no-changes-causes-untouched-files-to-modify
>
Yes i find all the mergeinfo changes bothersome too so if it doesn't
cause any side effects (and it doesn't sound like it will from the
link you posted) then lets remove the property.
...ant