You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Steve Cohen <sc...@javactivity.org> on 2011/03/23 22:37:18 UTC
SVN always thinks a few certain files need to be merged
Somewhere back in the distant past, I was a bad bad boy and did
something that SVN didn't like to get some merge to work. This happened
about two years ago.
Since then, these files are picked up for properties merges whenever I
merge their project even though they haven't really changed in years.
How can I FIX this merge info so I stop being bothered by them.
This is really annoying.
Re: SVN always thinks a few certain files need to be merged
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/3/24 David Huang <kh...@azeotrope.org>:
>
> On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
>
>> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>>> You are not giving much specifics, so how can people know what is going on
>>> in your case?
>>
>> Specifics for complete 100% reproducable problem:
>>
>> do svn update for whole project
>> create branch from trunk
>> change one source file, not the one with the bogus mergeinfo, commit it.
>> merge branch back to trunk
>>
>> before you commit the trunk, do a svn status
>> You will see the bogus mergeinfo listed as a change to the trunk.
>
>
> If you're sure that the mergeinfo is bogus, why not just delete it?
> e.g., svn propdel svn:mergeinfo fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
>
> http://www.collab.net/community/subversion/articles/merge-info.html
> might be worth a read too.
+1
Also this article, "Where Did That Mergeinfo Come From?"
http://blogs.collab.net/subversion/2009/11/where-did-that-mergeinfo-come-from/
Best regards,
Konstantin Kolinko
Re: SVN always thinks a few certain files need to be merged
Posted by Steve Cohen <sc...@javactivity.org>.
On 03/24/2011 05:11 PM, Bob Archer wrote:
>> On 03/24/2011 05:01 PM, Bob Archer wrote:
>>>> On 03/23/2011 08:02 PM, David Huang wrote:
>>>>>
>>>>> On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
>>>>>
>>>>>> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>>>>>>> You are not giving much specifics, so how can people know
>> what
>>>> is going on
>>>>>>> in your case?
>>>>>>
>>>>>> Specifics for complete 100% reproducable problem:
>>>>>>
>>>>>> do svn update for whole project
>>>>>> create branch from trunk
>>>>>> change one source file, not the one with the bogus mergeinfo,
>>>> commit it.
>>>>>> merge branch back to trunk
>>>>>>
>>>>>> before you commit the trunk, do a svn status
>>>>>> You will see the bogus mergeinfo listed as a change to the
>>>> trunk.
>>>>>
>>>>>
>>>>> If you're sure that the mergeinfo is bogus, why not just delete
>>>> it?
>>>>> e.g., svn propdel svn:mergeinfo
>>>> fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
>>>>>
>>>>> http://www.collab.net/community/subversion/articles/merge-
>>>> info.html might be worth a read too.
>>>>>
>>>>
>>>> My specifics are substantially similar to those of Mr. Farrell,
>>>> which
>>>> are essentially what I laid out in my original post that started
>>>> this
>>>> thread. And yet Mr. Kolinko complains I've not given him enough
>>>> specifics. One specific I can give is that our SVN server is
>> still
>>>> 1.5.4.
>>>>
>>>> Clearly something is broken here. If mergeinfo constantly
>> requires
>>>> merging when there are no changes, how is that to be fixed? The
>>>> documents that have been posted here provide way too much
>>>> information
>>>> for my use case. I should not need to understand that much of
>>>> subversion internals to fix this problem!
>>>
>>> Basically, what it comes down to is the fact that the merge info
>> on the files does not match the merge info on the parent folders.
>> Whenever and item in the path has mergeinfo and a merge is
>> performed that merge info is updated. (this is supposed to stop
>> happening as of 1.7 I believe). As long as there is merge info on a
>> file that isn't in the parent folder the merge info will remain at
>> the file level. Once they match the merge info in the children
>> (files) will be elided and you won't see this happen again.
>>>
>>> I assume every time you see these property changes you are
>> committing them?
>>>
>>>
>>> BOb
>>>
>>>
>>>
>>>
>> Yes, and thanks. What I take from your explanation is that
>> removing the
>> merge info from these files is both safe and effective in getting
>> where
>> I want to go (not be bothered by this anymore). Is that right?
>
> It's not that simple, but it can be. My question would be.. what is the difference between the mergeinfo on these files and the merge info on your project root (which is where you should always perform your merges for this to work best). Once you know the difference the question is "why are they different". If it was due to a bug in svn then you should be ok with some manual changes. If it is due to some revision not being merged in at the project root level then I would ask, why aren't they merged at the root level?
>
>>
>> Is there any downside?
>>
>
> Only you can answer that based on doing the above investigation. If you don't remove needed mergeinfo then there is no downside. ;)
>
> BOb
>
>
>
I probably did many things when I was learning this stuff that wouldn't
do now. But my punishment shouldn't be eternal.
Thanks.
RE: SVN always thinks a few certain files need to be merged
Posted by Bob Archer <Bo...@amsi.com>.
> On 03/24/2011 05:01 PM, Bob Archer wrote:
> >> On 03/23/2011 08:02 PM, David Huang wrote:
> >>>
> >>> On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
> >>>
> >>>> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
> >>>>> You are not giving much specifics, so how can people know
> what
> >> is going on
> >>>>> in your case?
> >>>>
> >>>> Specifics for complete 100% reproducable problem:
> >>>>
> >>>> do svn update for whole project
> >>>> create branch from trunk
> >>>> change one source file, not the one with the bogus mergeinfo,
> >> commit it.
> >>>> merge branch back to trunk
> >>>>
> >>>> before you commit the trunk, do a svn status
> >>>> You will see the bogus mergeinfo listed as a change to the
> >> trunk.
> >>>
> >>>
> >>> If you're sure that the mergeinfo is bogus, why not just delete
> >> it?
> >>> e.g., svn propdel svn:mergeinfo
> >> fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
> >>>
> >>> http://www.collab.net/community/subversion/articles/merge-
> >> info.html might be worth a read too.
> >>>
> >>
> >> My specifics are substantially similar to those of Mr. Farrell,
> >> which
> >> are essentially what I laid out in my original post that started
> >> this
> >> thread. And yet Mr. Kolinko complains I've not given him enough
> >> specifics. One specific I can give is that our SVN server is
> still
> >> 1.5.4.
> >>
> >> Clearly something is broken here. If mergeinfo constantly
> requires
> >> merging when there are no changes, how is that to be fixed? The
> >> documents that have been posted here provide way too much
> >> information
> >> for my use case. I should not need to understand that much of
> >> subversion internals to fix this problem!
> >
> > Basically, what it comes down to is the fact that the merge info
> on the files does not match the merge info on the parent folders.
> Whenever and item in the path has mergeinfo and a merge is
> performed that merge info is updated. (this is supposed to stop
> happening as of 1.7 I believe). As long as there is merge info on a
> file that isn't in the parent folder the merge info will remain at
> the file level. Once they match the merge info in the children
> (files) will be elided and you won't see this happen again.
> >
> > I assume every time you see these property changes you are
> committing them?
> >
> >
> > BOb
> >
> >
> >
> >
> Yes, and thanks. What I take from your explanation is that
> removing the
> merge info from these files is both safe and effective in getting
> where
> I want to go (not be bothered by this anymore). Is that right?
It's not that simple, but it can be. My question would be.. what is the difference between the mergeinfo on these files and the merge info on your project root (which is where you should always perform your merges for this to work best). Once you know the difference the question is "why are they different". If it was due to a bug in svn then you should be ok with some manual changes. If it is due to some revision not being merged in at the project root level then I would ask, why aren't they merged at the root level?
>
> Is there any downside?
>
Only you can answer that based on doing the above investigation. If you don't remove needed mergeinfo then there is no downside. ;)
BOb
Re: SVN always thinks a few certain files need to be merged
Posted by Steve Cohen <sc...@javactivity.org>.
On 03/24/2011 05:01 PM, Bob Archer wrote:
>> On 03/23/2011 08:02 PM, David Huang wrote:
>>>
>>> On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
>>>
>>>> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>>>>> You are not giving much specifics, so how can people know what
>> is going on
>>>>> in your case?
>>>>
>>>> Specifics for complete 100% reproducable problem:
>>>>
>>>> do svn update for whole project
>>>> create branch from trunk
>>>> change one source file, not the one with the bogus mergeinfo,
>> commit it.
>>>> merge branch back to trunk
>>>>
>>>> before you commit the trunk, do a svn status
>>>> You will see the bogus mergeinfo listed as a change to the
>> trunk.
>>>
>>>
>>> If you're sure that the mergeinfo is bogus, why not just delete
>> it?
>>> e.g., svn propdel svn:mergeinfo
>> fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
>>>
>>> http://www.collab.net/community/subversion/articles/merge-
>> info.html might be worth a read too.
>>>
>>
>> My specifics are substantially similar to those of Mr. Farrell,
>> which
>> are essentially what I laid out in my original post that started
>> this
>> thread. And yet Mr. Kolinko complains I've not given him enough
>> specifics. One specific I can give is that our SVN server is still
>> 1.5.4.
>>
>> Clearly something is broken here. If mergeinfo constantly requires
>> merging when there are no changes, how is that to be fixed? The
>> documents that have been posted here provide way too much
>> information
>> for my use case. I should not need to understand that much of
>> subversion internals to fix this problem!
>
> Basically, what it comes down to is the fact that the merge info on the files does not match the merge info on the parent folders. Whenever and item in the path has mergeinfo and a merge is performed that merge info is updated. (this is supposed to stop happening as of 1.7 I believe). As long as there is merge info on a file that isn't in the parent folder the merge info will remain at the file level. Once they match the merge info in the children (files) will be elided and you won't see this happen again.
>
> I assume every time you see these property changes you are committing them?
>
>
> BOb
>
>
>
>
Yes, and thanks. What I take from your explanation is that removing the
merge info from these files is both safe and effective in getting where
I want to go (not be bothered by this anymore). Is that right?
Is there any downside?
RE: SVN always thinks a few certain files need to be merged
Posted by Bob Archer <Bo...@amsi.com>.
> On 03/23/2011 08:02 PM, David Huang wrote:
> >
> > On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
> >
> >> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
> >>> You are not giving much specifics, so how can people know what
> is going on
> >>> in your case?
> >>
> >> Specifics for complete 100% reproducable problem:
> >>
> >> do svn update for whole project
> >> create branch from trunk
> >> change one source file, not the one with the bogus mergeinfo,
> commit it.
> >> merge branch back to trunk
> >>
> >> before you commit the trunk, do a svn status
> >> You will see the bogus mergeinfo listed as a change to the
> trunk.
> >
> >
> > If you're sure that the mergeinfo is bogus, why not just delete
> it?
> > e.g., svn propdel svn:mergeinfo
> fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
> >
> > http://www.collab.net/community/subversion/articles/merge-
> info.html might be worth a read too.
> >
>
> My specifics are substantially similar to those of Mr. Farrell,
> which
> are essentially what I laid out in my original post that started
> this
> thread. And yet Mr. Kolinko complains I've not given him enough
> specifics. One specific I can give is that our SVN server is still
> 1.5.4.
>
> Clearly something is broken here. If mergeinfo constantly requires
> merging when there are no changes, how is that to be fixed? The
> documents that have been posted here provide way too much
> information
> for my use case. I should not need to understand that much of
> subversion internals to fix this problem!
Basically, what it comes down to is the fact that the merge info on the files does not match the merge info on the parent folders. Whenever and item in the path has mergeinfo and a merge is performed that merge info is updated. (this is supposed to stop happening as of 1.7 I believe). As long as there is merge info on a file that isn't in the parent folder the merge info will remain at the file level. Once they match the merge info in the children (files) will be elided and you won't see this happen again.
I assume every time you see these property changes you are committing them?
BOb
Re: SVN always thinks a few certain files need to be merged
Posted by Steve Cohen <sc...@javactivity.org>.
On 03/23/2011 08:02 PM, David Huang wrote:
>
> On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
>
>> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>>> You are not giving much specifics, so how can people know what is going on
>>> in your case?
>>
>> Specifics for complete 100% reproducable problem:
>>
>> do svn update for whole project
>> create branch from trunk
>> change one source file, not the one with the bogus mergeinfo, commit it.
>> merge branch back to trunk
>>
>> before you commit the trunk, do a svn status
>> You will see the bogus mergeinfo listed as a change to the trunk.
>
>
> If you're sure that the mergeinfo is bogus, why not just delete it?
> e.g., svn propdel svn:mergeinfo fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
>
> http://www.collab.net/community/subversion/articles/merge-info.html might be worth a read too.
>
My specifics are substantially similar to those of Mr. Farrell, which
are essentially what I laid out in my original post that started this
thread. And yet Mr. Kolinko complains I've not given him enough
specifics. One specific I can give is that our SVN server is still 1.5.4.
Clearly something is broken here. If mergeinfo constantly requires
merging when there are no changes, how is that to be fixed? The
documents that have been posted here provide way too much information
for my use case. I should not need to understand that much of
subversion internals to fix this problem!
> If you're sure that the mergeinfo is bogus, why not just delete it?
Because I'm scared as hell to mess with it! Who KNOWS what the effect
of deleting mergeinfo is? Once bitten, twice-shy. What side-effects
deleting mergeinfo will have? Can someone explain that to me?
If someone can tell me what the effects of deleting mergeinfo will be I
would be willing to try it.
RE: SVN always thinks a few certain files need to be merged
Posted by Bob Archer <Bo...@amsi.com>.
> On 03/23/2011 08:09 PM, Pat Farrell wrote:
> > On 03/23/2011 09:02 PM, David Huang wrote:
> >> If you're sure that the mergeinfo is bogus, why not just delete
> it?
> >> e.g., svn propdel svn:mergeinfo
> fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
> >
> > I'm sure. I'll try that.
> > I have not tried it before, because I can't figure out what in
> the heck
> > mergeinfo was supposed to do, and there have been lots of
> comments that
> > it really didn't work properly in 1.5, and that it works
> differently in
> > 1.6, etc.
> >
> > in other words, I didn't know to do that.
> >
> > Or even that such as command existed.
> >
> > For me, blowing up all mergeinfo would improve SVN.
> >
> > propset/propedit/propdel is opaque to me, everytime I try to use
> it, I
> > spend an hour dorking around trying random combination of specs,
> > directories, etc.
> >
>
> Again, the SVN gurus need to listen to Mr. Farrell and myself here.
>
> Ordinary users should not be required to understand mergeinfo at
> the
> level that is being presented here.
>
> What is it?
> Why is it needed?
> If it gets screwed up, and you delete it, what are you losing? You
> must
> be losing something, else why have it in the first place?
>
> It's not right to suggest simply getting rid of it without
> explaining
> the full consequences of that action.
>
> This is how I got in trouble in the first place.
>
> Have to agree with Mr. Farrell:
>
> > For me, blowing up all mergeinfo would improve SVN.
> >
> > propset/propedit/propdel is opaque to me, everytime I try to use
> it, I
> > spend an hour dorking around trying random combination of specs,
> > directories, etc.
>
> Unless the pros here can do better than they've done in explaining
> this
> whole area is a real black eye for SVN.
>
> My repository is still at 1.5.4. I can have my SCM team upgrade me
> to
> 1.6.something. Should I do this, and would it help this problem?
It depends on what version you were on... but early versions of 1.5 did create alot more mergeinfo than was necessary... and also it was created in some instances when it shouldn't have been. I highly suggest you get up to date. However, that won't "resolve" this issue... although it isn't really an issue... see my previous email.
BOb
Re: SVN always thinks a few certain files need to be merged
Posted by Steve Cohen <sc...@javactivity.org>.
On 03/23/2011 08:09 PM, Pat Farrell wrote:
> On 03/23/2011 09:02 PM, David Huang wrote:
>> If you're sure that the mergeinfo is bogus, why not just delete it?
>> e.g., svn propdel svn:mergeinfo fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
>
> I'm sure. I'll try that.
> I have not tried it before, because I can't figure out what in the heck
> mergeinfo was supposed to do, and there have been lots of comments that
> it really didn't work properly in 1.5, and that it works differently in
> 1.6, etc.
>
> in other words, I didn't know to do that.
>
> Or even that such as command existed.
>
> For me, blowing up all mergeinfo would improve SVN.
>
> propset/propedit/propdel is opaque to me, everytime I try to use it, I
> spend an hour dorking around trying random combination of specs,
> directories, etc.
>
Again, the SVN gurus need to listen to Mr. Farrell and myself here.
Ordinary users should not be required to understand mergeinfo at the
level that is being presented here.
What is it?
Why is it needed?
If it gets screwed up, and you delete it, what are you losing? You must
be losing something, else why have it in the first place?
It's not right to suggest simply getting rid of it without explaining
the full consequences of that action.
This is how I got in trouble in the first place.
Have to agree with Mr. Farrell:
> For me, blowing up all mergeinfo would improve SVN.
>
> propset/propedit/propdel is opaque to me, everytime I try to use it, I
> spend an hour dorking around trying random combination of specs,
> directories, etc.
Unless the pros here can do better than they've done in explaining this
whole area is a real black eye for SVN.
My repository is still at 1.5.4. I can have my SCM team upgrade me to
1.6.something. Should I do this, and would it help this problem?
Re: SVN always thinks a few certain files need to be merged
Posted by Pat Farrell <pf...@pfarrell.com>.
On 03/23/2011 09:02 PM, David Huang wrote:
> If you're sure that the mergeinfo is bogus, why not just delete it?
> e.g., svn propdel svn:mergeinfo fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
I'm sure. I'll try that.
I have not tried it before, because I can't figure out what in the heck
mergeinfo was supposed to do, and there have been lots of comments that
it really didn't work properly in 1.5, and that it works differently in
1.6, etc.
in other words, I didn't know to do that.
Or even that such as command existed.
For me, blowing up all mergeinfo would improve SVN.
propset/propedit/propdel is opaque to me, everytime I try to use it, I
spend an hour dorking around trying random combination of specs,
directories, etc.
--
Pat Farrell
http://www.pfarrell.com/
Re: SVN always thinks a few certain files need to be merged
Posted by David Huang <kh...@azeotrope.org>.
On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:
> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>> You are not giving much specifics, so how can people know what is going on
>> in your case?
>
> Specifics for complete 100% reproducable problem:
>
> do svn update for whole project
> create branch from trunk
> change one source file, not the one with the bogus mergeinfo, commit it.
> merge branch back to trunk
>
> before you commit the trunk, do a svn status
> You will see the bogus mergeinfo listed as a change to the trunk.
If you're sure that the mergeinfo is bogus, why not just delete it?
e.g., svn propdel svn:mergeinfo fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
http://www.collab.net/community/subversion/articles/merge-info.html might be worth a read too.
--
Name: Dave Huang | Mammal, mammal / their names are called /
INet: khym@azeotrope.org | they raise a paw / the bat, the cat /
FurryMUCK: Dahan | dolphin and dog / koala bear and hog -- TMBG
Dahan: Hani G Y+C 35 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+ B+ PA+ PL++
Re: SVN always thinks a few certain files need to be merged
Posted by Pat Farrell <pf...@pfarrell.com>.
On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
> You are not giving much specifics, so how can people know what is going on
> in your case?
Specifics for complete 100% reproducable problem:
do svn update for whole project
create branch from trunk
change one source file, not the one with the bogus mergeinfo, commit it.
merge branch back to trunk
before you commit the trunk, do a svn status
You will see the bogus mergeinfo listed as a change to the trunk.
for example:
svn merge https://www.everythingtiny.com/repos/bbook/branches/pat -r
14135:14147
--- Merging r14146 through r14147 into '.':
U fnflib/src/com/fnfbook/daemon/helpers/MailToBlog.java
pfarrell@tools:~/sandbox/bbook/trunk$ svn status
M .
M fnflib/src/com/fnfbook/daemon/helpers/MailToBlog.java
M fnfapp/src/java/com/fnfbook/bean/FilterListBase.java
The "FilterListBase" is marked as modified, but it has not been changed
in a year and was not changed in this
edit, only the "MailToBlog.java" file was modified.
--
Pat Farrell
http://www.pfarrell.com/
Re: SVN always thinks a few certain files need to be merged
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/3/24 Steve Cohen <sc...@javactivity.org>:
>
> The files haven't changed in two years. Yet every time I do a merge I
> encounter them. And all it's about is "merge info". Isn't there some way
> to get the "merge info" right? There MUST BE.
>
Maybe "svn merge --record-only" on the root of the project with that
revision that is mentioned in your file's svn:merge-info property. You
are not giving much specifics, so how can people know what is going on
in your case?
Re: SVN always thinks a few certain files need to be merged
Posted by Steve Cohen <sc...@javactivity.org>.
On 03/23/2011 05:36 PM, Pat Farrell wrote:
>>> Since then, these files are picked up for properties merges whenever I merge
>>> their project even though they haven't really changed in years. How can I
>>> FIX this merge info so I stop being bothered by them.
>>
>> Wouldn't "svn revert filename" clear this? Or did you want to keep your changes?
>
> Nope. I've had the same problem for at least a year. I think it was
> caused by a bug in the implementation of "merge info" back in 1.5 days.
>
> For me, the file in question has not been modified in at least a year.
> Yet every time I do anything to other files, it is marked as updated.
>
> I have no idea how to fix it, but I sure would want to find a solution.
>
Exactly.
The files haven't changed in two years. Yet every time I do a merge I
encounter them. And all it's about is "merge info". Isn't there some
way to get the "merge info" right? There MUST BE.
Re: SVN always thinks a few certain files need to be merged
Posted by Pat Farrell <pf...@pfarrell.com>.
>> Since then, these files are picked up for properties merges whenever I merge
>> their project even though they haven't really changed in years. How can I
>> FIX this merge info so I stop being bothered by them.
>
> Wouldn't "svn revert filename" clear this? Or did you want to keep your changes?
Nope. I've had the same problem for at least a year. I think it was
caused by a bug in the implementation of "merge info" back in 1.5 days.
For me, the file in question has not been modified in at least a year.
Yet every time I do anything to other files, it is marked as updated.
I have no idea how to fix it, but I sure would want to find a solution.
--
Pat Farrell
http://www.pfarrell.com/
Re: SVN always thinks a few certain files need to be merged
Posted by Nico Kadel-Garcia <nk...@gmail.com>.
On Wed, Mar 23, 2011 at 5:37 PM, Steve Cohen <sc...@javactivity.org> wrote:
> Somewhere back in the distant past, I was a bad bad boy and did something
> that SVN didn't like to get some merge to work. This happened about two
> years ago.
>
> Since then, these files are picked up for properties merges whenever I merge
> their project even though they haven't really changed in years. How can I
> FIX this merge info so I stop being bothered by them.
>
> This is really annoying.
Wouldn't "svn revert filename" clear this? Or did you want to keep your changes?