Hi there,
Shouldn't this script be free of merge conflicts?
Thank you for a great tool! I've been collecting issues during our 0.19->0.26 transition, and do not intend to keep posting like a maniac! :-)
But I do think this and my previous posts are issues that aren't in IzzueZilla, and don't mind entering them if they are deemed real and unknown.
Peter
rm -rf repo wc tmpfile
svnadmin create repo
svn mkdir -m "" file://`pwd`/repo/zig
svn mkdir -m "" file://`pwd`/repo/zig/zag
svn mkdir -m "" file://`pwd`/repo/foo
# This and the propset below creates a completely other conflict
echo '$Id:$' > tmpfile
svn import -m "" tmpfile file://`pwd`/repo/zig/zag/keyw_id
# Can't only use local files for propset in 0.26
svn co file://`pwd`/repo/zig/ wc
echo '$Id:$' > wc/keyw_id
svn add wc/keyw_id
echo '$Id:$' > wc/zag/keyw_id2
svn add wc/zag/keyw_id2
svn propset svn:keywords Id wc/keyw_id wc/zag/keyw_id wc/zag/keyw_id2
svn ci -m "" wc
rm -rf wc
svn co file://`pwd`/repo/foo wc
svn merge -r1:HEAD file://`pwd`/repo/zig wc
echo '*** Status ***'
svn st wc
This creates this output. Note that there is no conflict for wc/keyw_id but that there are conflicts for both in wc/zag:
*** Status ***
! wc
A + wc/keyw_id
A + wc/zag
C + wc/zag/keyw_id
? wc/zag/keyw_id.older
? wc/zag/keyw_id.working
? wc/zag/keyw_id.yours
C + wc/zag/keyw_id2
? wc/zag/keyw_id2.older
? wc/zag/keyw_id2.working
? wc/zag/keyw_id2.yours
elenn@pvm:/tmp/svn> ls -oh wc/zag
total 24k
-rw-r--r-- 1 pvm 124 Jul 29 13:11 keyw_id
-rw-r--r-- 1 pvm 0 Jul 29 13:11 keyw_id.older
-rw-r--r-- 1 pvm 42 Jul 29 13:11 keyw_id.working
-rw-r--r-- 1 pvm 42 Jul 29 13:11 keyw_id.yours
-rw-r--r-- 1 pvm 126 Jul 29 13:11 keyw_id2
-rw-r--r-- 1 pvm 0 Jul 29 13:11 keyw_id2.older
-rw-r--r-- 1 pvm 43 Jul 29 13:11 keyw_id2.working
-rw-r--r-- 1 pvm 43 Jul 29 13:11 keyw_id2.yours
delenn@pvm:/tmp/svn> ls -oh wc/zag
total 24k
-rw-r--r-- 1 pvm 124 Jul 29 13:11 keyw_id
-rw-r--r-- 1 pvm 0 Jul 29 13:11 keyw_id.older
-rw-r--r-- 1 pvm 42 Jul 29 13:11 keyw_id.working
-rw-r--r-- 1 pvm 42 Jul 29 13:11 keyw_id.yours
-rw-r--r-- 1 pvm 126 Jul 29 13:11 keyw_id2
-rw-r--r-- 1 pvm 0 Jul 29 13:11 keyw_id2.older
-rw-r--r-- 1 pvm 43 Jul 29 13:11 keyw_id2.working
-rw-r--r-- 1 pvm 43 Jul 29 13:11 keyw_id2.yours
delenn@pvm:/tmp/svn> diff wc/zag/keyw_id.working wc/zag/keyw_id.yours
delenn@pvm:/tmp/svn>
--------------------------------------
Protect yourself from spam,
use http://sneakemail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 29 16:26:58 2003