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

svn merge not showing conflict

From: Manesh R <manesh_at_cordys.com>
Date: 2005-07-13 09:56:42 CEST

Hi All,

I am using svn merge to merge files across branches and I observed a strange behavior. I would like to know, if this is expected (That's why I am sending it to dev).

Explaining the scenario first.
1. I have two branches (b1 & b2) and current HEAD is 1724
2. I created a text file with some content
3. Added and committed text file to b1 (revision - 1725)
4. Added and committed text file to b2 (revision - 1726)
5. Checked out b2
6. Modified text file (edited an already existing line) in b2 and committed (1727)
7. Try to do an svn merge
svn merge -r 1724:HEAD URL_of_b1 LWC_of_b2

On this merge "text file" is shown to be added. When I run svn status, it shows conflicted. If it is conflicted, then I expect "svn merge" to show me a conflict rather than addition (Otherwise --dry-run option is misleading. To know the actual results it will force me to run svn merge and then a status on working copy).

Is my expectation correct (in that case there is some problem with svn merge) I am using 1.2.0 client for doing these operations.

--------------------------------------------------- Log of what I did -----------------
D:\temp>svn commit unicode -m "Test merge"
Adding unicode\36.3_TO_36.5_csv.txt
Transmitting file data .
Committed revision 1725.

D:\temp>svn commit unicode_AC -m "Test merge"
Adding unicode_AC\36.3_TO_36.5_csv.txt
Transmitting file data .
Committed revision 1726.

D:\temp>svn commit unicode_AC -m "Test merge"
Sending unicode_AC\36.3_TO_36.5_csv.txt
Transmitting file data .
Committed revision 1727.

D:\temp>cd unicode_AC

D:\temp\unicode_AC>svn merge -r 1724:HEAD http://srv-ind-conf1/repos/mergeplay/unicode/ .
A 36.3_TO_36.5_csv.txt

D:\temp\unicode_AC>svn st
? 36.3_TO_36.5_csv.txt.merge-left.r0
? 36.3_TO_36.5_csv.txt.merge-right.r1727
? 36.3_TO_36.5_csv.txt.working
C 36.3_TO_36.5_csv.txt

D:\temp\unicode_AC>

Regards,
Manesh

**********************************************************************
The information in this message is confidential and may be legally
privileged. It is intended solely for the addressee. Access to this message
by anyone else is unauthorized. If you are not the intended recipient, any
disclosure, copying, or distribution of the message, or any action or
omission taken by you in reliance on it, is prohibited and may be unlawful.
Please immediately contact the sender if you have received this message in
error.
**********************************************************************

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 13 09:57:33 2005

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