[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn oddity/annoyance re files changed by merge reintegration

From: Shachar Tal <shachar_at_equitick.com>
Date: Sat, 25 Jul 2009 15:34:52 +0300

Hi,
I'll give an example and explain what seems odd to me:
1. I have file in /trunk named foo.c
2. I create a branch (this is r100)
3. I change foo.c in trunk and commit (r101)
4. I merge trunk->branch (and see that the file is updated)
5. I commit the merge result in branch (r102)
6. I do merge --reintegrate back to trunk clean WC, and foo.c is marked as
updated.
7. I commit the merge changes (r103).

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?

Thanks,

Shachar Tal
Equitick
T: +972-3-6181188
M: +972-54-543-0108

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-25 15:03:27 CEST

This is an archived mail posted to the Subversion Users mailing list.