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: 978.467.1404
Mobile: 978-257-2183
jlm_at_zeevee.com
www.zeevee.com
> -----Original Message-----
> From: David Aldrich [mailto:david.aldrich_at_eu.nec.com]
> Sent: Wednesday, November 04, 2009 8:35 AM
> To: Greg Troxel
> Cc: users_at_subversion.tigris.org
> 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_at_subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2414421
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-04 15:23:01 CET