Re: svn oddity/annoyance re files changed by merge reintegration

Shachar Tal wrote:
> What's odd and annoying here is that foo.c is marked as changed in the
> reintegration, even though all changes were done on the trunk. This
> stinks since when I'm reintegrating a large project from a branch back
> onto the trunk, I want to review my changes during the reintegration
> process, and here I get gazillion changes to review instead of just
> mine. moreover, the change of the file is an empty one and clutters the
> "svn log" output for the file.
>
> Am I doing something wrong? is my SVN broken? Can I do anything to
> improve this?

Hi Shachar,

Your SVN is not broken. This question has actually come up a lot;
searching the archives of this list for "mergeinfo" should answer most
of your questions.

-Mike

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-27 19:22:47 CEST