Hi,
I believe this has been discussed before, but I couldn't find a good
answer as to whether this is "normal".
The scenario: individuals are working on a release support branch and
selectively merging fixes from the trunk into the support branch.
Typically I advise folks to submit to the support branch first and then
merge back into the trunk, but there are occasions where the trunk gets
the bugfix first. People are running the following command in the
support branch (Project/branches/rel1-support):
svn merge -cREV https://hostname/svn/Project/trunk .
and getting not only the files intended (the ones that were modified in
the revision REV), but also mergeinfo property changes on completely
unrelated files. A final svn status looks like this:
12345678
M .
M fileExpected
M fileUnexpected
M fileUnexpected
M fileUnexpected
This is causing a lot of confusion with our developers, and moreover, we
have hooks with CodeCollaborator that require all of the files being
committed be in a code review - this configuration is requiring
individuals to add all of these files that have only property changes to
the reviews, generating excessive noise.
My question is, obviously, what is going on here? Why is mergeinfo
being modified on files that have nothing to do with the changeset that
I'm actually merging?
One other note, I see this with a 1.5.4 client/1.5.0 server
configuration - I do not see this with a 1.5.0 client/1.5.0 server
configuration.
Thanks,
Joe
Joseph Bell
joe.bell_at_prodeasystems.com
This message is confidential to Prodea Systems, Inc unless otherwise indicated
or apparent from its nature. This message is directed to the intended recipient
only, who may be readily determined by the sender of this message and its
contents. If the reader of this message is not the intended recipient, or an
employee or agent responsible for delivering this message to the intended
recipient:(a)any dissemination or copying of this message is strictly
prohibited; and(b)immediately notify the sender by return message and destroy
any copies of this message in any form(electronic, paper or otherwise) that you
have.The delivery of this message and its information is neither intended to be
nor constitutes a disclosure or waiver of any trade secrets, intellectual
property, attorney work product, or attorney-client communications. The
authority of the individual sending this message to legally bind Prodea Systems
is neither apparent nor implied,and must be independently verified.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980189
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-08 10:44:23 CET