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

svn 1.5 merge -c revision and svn diff/log confusion

From: Karol Szkudlarek <karol_at_mikronika.com.pl>
Date: Wed, 28 Oct 2009 16:17:25 +0100


I have a production system repository which were about half year ago
migrated from 1.3.x to 1.5.x server. We also do svnadmin dump/load
procedure to full migrate to 1.5. And nothing all.

In 1.3 and we used 'svn merge' subcommand with great success. But now I
noticed something that make me doubt in new subversion mergetracking

Please look and example of svn log from my repository which was obtained
after executing merge from branch->branch and svn commit on branch.

$ cd src/sql
$ svn merge -c 52829

and after it I commited the changes (of course I don't have any local
modification on the branch) and I do svn log -v -r 52851 -g I saw that
my commit contains "more" that original commit r52829. After svn diff
I saw that commit r52851 contains mergeinfo "mess" for a random files
and random directories of sql/. So could anybody help me in interpreting
such sitiuation?

In r52829 was only change in rdzexp.ini.xml file but in
r52851 I have "something" more which provides me a lot of confusion and
I do ask myself whether I perform svn merge correctly. I expected svn
log/diff to show me only changes in this one file rdzexp.ini.xml.

This is only one example, beacuse I do more svn merges I noticed such
differences betweeen contents of original commit and commit after merge
which I can't understand.

$ svn log -v -r 52851 -g

r52851 | karols | 2009-10-28 12:01:39 +0100 (Śr, 28 paź 2009) | 6 lines
Changed paths:
    M /branches/rv_qt_2_9_16/prg/src/sql
    M /branches/rv_qt_2_9_16/prg/src/sql/oracle
    M /branches/rv_qt_2_9_16/prg/src/sql/oracle/se_manager
    M /branches/rv_qt_2_9_16/prg/src/sql/toricfg/patterns/rdzexp.ini.xml

Tori Patterns: dodany kom.tylkoZmiana do rdzexp.ini.xml

merge 29.52829.

r52829 | huberts | 2009-10-28 10:12:53 +0100 (Śr, 28 paź 2009) | 2 lines
Changed paths:
    M /branches/rv_qt_2_9/prg/src/sql/toricfg/patterns/rdzexp.ini.xml
Merged via: r52851

Tori Patterns: dodany kom.tylkoZmiana do rdzexp.ini.xml


Karol Szkudlarek
ul. Wykopy 2/4
60-001 POZNAÑ
tel. +48 61 6655600
fax +48 61 6655602
e-mail karol_at_mikronika.com.pl
Please consider your environmental responsibility.
Before printing this e-mail message, ask yourself
whether you really need a hard copy.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

Received on 2009-10-28 16:22:48 CET

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