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

issue with merges in 1.5rc7 with props, script attached.

From: Alfred Perlstein <alfred_at_freebsd.org>
Date: Wed, 25 Jun 2008 11:44:49 -0700

Hey guys, I'm having some issues using the merge tool with
svn, version 1.5.0 (Release Candidate 7)

Please see the message, it gives pretty easy way to replicate
my problem.

Prop changes cause full conflicts, is there a workaround?

thank you!

----- Forwarded message from Alfred Perlstein <alfred_at_freebsd.org> -----

From: Alfred Perlstein <alfred_at_freebsd.org>
To: dev_at_subversion.tigris.org
Cc: alfred_at_juniper.net
Subject: issue with merges in 1.5 with props, script attached.
Date: Tue, 24 Jun 2008 09:58:55 -0700
Message-ID: <20080624165855.GJ95574_at_elvis.mu.org>
User-Agent: Mutt/

Hey guys,

When using merging with properties I get conflicts
even when the merge should succeed without issue.

It's easy enough to reproduce with the script attached.

Note: please change:
in the script to point at your repo.

What I would like is:
1) non-meta-data should just merge without issue
2) option to specify to always "take" a property from
   either the TO or FROM branch as a seperate option.


- Alfred Perlstein
 # Show how "props" set on files causes merge conflicts where there should
 # be none.
 # Alfred Perlstein, Juniper Networks 2008
 # Make my project top level and the "trunk"
 svn mkdir --parents -m "mkdir testproj" ${SVNROOT}/${TESTPROJ}/trunk
 # Make space for branches.
 svn mkdir --parents -m "mkdir testproj" ${SVNROOT}/${TESTPROJ}/branches
 # Checkout trunk, add a file "bar.c" to it, commit it
 # set "mtime" property and commit.
 svn co ${SVNROOT}/${TESTPROJ}/trunk
 cd trunk
 echo foo >> bar.c
 svn add bar.c
 svn commit -m "add bar in trunk"
 svn propset mtime 1 bar.c
 svn commit -m "add mtime prop" bar.c
 # make a branch.
 svn cp -m "branch it" ${SVNROOT}/${TESTPROJ}/trunk ${SVNROOT}/${TESTPROJ}/branches/testbranch
 # check out my branch, don't do anything yet...
 cd ../
 svn co ${SVNROOT}/${TESTPROJ}/branches/testbranch
 # go back into trunk.  modify the file, adding some data and modify the
 # mtime meta data.
 cd trunk
 echo barrrrrr >> bar.c
 svn propset mtime 2 bar.c
 svn commit -m "second change with mtime=2" bar.c
 # go back to my "testbranch" and try to merge.
 # this will show conflicts in both metadata and data!
 cd ../testbranch
 svn merge ${SVNROOT}/${TESTPROJ}/trunk
#Conflict for property 'mtime' discovered on 'bar.c'.
#Select: (p) postpone, (mf) mine-full, (tf) theirs-full,
#        (h) help for more options: tf
#Conflict discovered in 'bar.c'.
#Select: (p) postpone, (df) diff-full, (e) edit,
#        (h) help for more options: df
#--- .svn/tmp/tempfile.tmp       Mon Jun 23 19:16:29 2008
#+++ .svn/tmp/tempfile.3.tmp     Mon Jun 23 19:17:34 2008
#@@ -0,0 +1,7 @@
#+<<<<<<< .working
#+||||||| .merge-left.r0
#"svn-merge-madness-done.txt" 73L, 2514C written
----- End forwarded message -----
- Alfred Perlstein
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-25 20:45:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.