Surprising merge results - Mergeinfo Elision?

[David Aldrich-2]

Some parts of this message have been removed. Learn more about Nabble's security policy.

Hi

 

I am using a GUI svn client based on SVNkit 1.3.1, which I believe is aligned with svn 1.6.5 approx, and svn server 1.5.2.

 

I have just merged changes from my project's trunk into my branch and am surprised to see that I have 100 files showing a local state of 'Modified (properties only)'. If I examine the changes I find that the only change on each of these files is that the svn:mergeinfo property has been removed.

 

I have been told that this may be caused by "Mergeinfo Elision", please will someone explain what may be happening and whether it is expected behaviour?

 

(I know this forum is concerned with only the svn binaries so I could repeat the operation using only the svn client, but I am expecting that this is not SVNKit specific behaviour).

 

Any help would be appreciated.

Best regards

David

 

[Greg Troxel]

David Aldrich <david.aldrich@...> writes:

[mail formatting repaired - lines should be <80 characters]

> I am using a GUI svn client based on SVNkit 1.3.1, which I believe is
> aligned with svn 1.6.5 approx, and svn server 1.5.2.
>
> I have just merged changes from my project's trunk into my branch and
> am surprised to see that I have 100 files showing a local state of
> 'Modified (properties only)'. If I examine the changes I find that the
> only change on each of these files is that the svn:mergeinfo property
> has been removed.

I suspect this is the client cleaning up redundant subtree mergeinfo.
Ask yourself if the effective mergeinfo for those files matches before
and after the removal.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2414401

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

[David Aldrich-2]

Hi Greg

> I suspect this is the client cleaning up redundant subtree mergeinfo.
> Ask yourself if the effective mergeinfo for those files matches before and
> after the removal.

Sorry, I don't understand the question. Should I commit these files or revert them?

It's very confusing that they show up at all. Is this a fault with the client?

David

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2414406

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

[Jeremy Mordkoff-4]

If the effective mergeinfo is the same with or without these property
values, then you should commit the changes. Otherwise the old mergeinfo
for those files will be reinstated and it will supersede the inherited
mergeinfo.

If for some reason the effective mergeinfo is NOT the same with or
without these properties, then you have a pretty serious bug and I would
not commit anything until you understand what is going on.

If you could post
(a) the file's or directories merge info from before the merge
(b) the parent's merge info from before the merge
(c) the parent's merge info after the merge
(d) what you merged

Perhaps we could comment on whether this elision was done correctly or
not.

JLM


Jeremy Mordkoff
Director, QA, IT & Release
ZeeVee, Inc.
One Monarch Drive | Littleton, MA 01460
Office: 978.467.1395 x233 | Fax: [phone]
Mobile: [phone]
jlm@...
www.zeevee.com

> -----Original Message-----
> From: David Aldrich [mailto:david.aldrich@...]
> Sent: Wednesday, November 04, 2009 8:35 AM
> To: Greg Troxel
> Cc: users@...
> Subject: RE: Surprising merge results - Mergeinfo Elision?
>
> Hi Greg
>
> > I suspect this is the client cleaning up redundant subtree

mergeinfo.
> > Ask yourself if the effective mergeinfo for those files matches
before and
> > after the removal.
>
> Sorry, I don't understand the question. Should I commit these files or
revert them?
>
> It's very confusing that they show up at all. Is this a fault with the
client?
>
> David
>
> ------------------------------------------------------
>
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageI
d=2414406
>
> To unsubscribe from this discussion, e-mail:
[users-unsubscribe@...].

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2414421

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].