I'm trying to use svnmerge to keep track of my various branches.
What I have is one parent and multiple child/derived branches
from that parent branch. If I set up svnmerge for one child
branch only then all is well. Once I add a second child, it
can no longer figure out any merge infomation :-(
I checked out svnmerge.py directly from the subversion tree
on/about Jan 22, 2006.
-rwxr-xr-x 1 gthomas wheel 72648 Jan 22 03:55 /home/gthomas/bin/svnmerge.py
Attached is a little script I wrote that demonstrates the
problem I'm seeing. I'm sorry if this is a well known problem,
I've read what I could find on the web - I couldn't locate
archives for this mailing list.
Thanks in advance
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
#! /bin/bash
#
# Simple script to build & test SVN trees, using svnmerge
#
# Create initial SVN
rm -fr /tmp/test_svn /tmp/branchA /tmp/branchB /tmp/main
svnadmin create /tmp/test_svn
svn mkdir -q -m "testing merges" file:///tmp/test_svn/main
# Create two branches off the main
svn cp -q -m "BranchA" file:///tmp/test_svn/{main,branchA}
svn cp -q -m "BranchB" file:///tmp/test_svn/{main,branchB}
# Now create some revisions on each branch
cd /tmp
svn co -q file:///tmp/test_svn/branchA
cd branchA
cp /etc/hosts .;svn add -q hosts
cp /etc/passwd .;svn add -q passwd
date >now;svn add -q now
svn ci -m "BranchA rev 1" -q
date >now
svn ci -m "BranchA rev 2" -q
cd /tmp
svn co -q file:///tmp/test_svn/branchB
cd branchB
cp /etc/fstab .;svn add -q fstab
cp /etc/hosts.allow .;svn add -q hosts.allow
date >now;svn add -q now
svn ci -m "BranchB rev 1" -q
date >now
svn ci -m "BranchB rev 2" -q
# Now try svnmerge
cd /tmp
svn co -q file:///tmp/test_svn/main
cd main
svnmerge.py init -f mergeA.msg /tmp/branchA
svn ci -F mergeA.msg -q
svn pg svnmerge-integrated
svnmerge.py avail
svnmerge.py init -f mergeB.msg /tmp/branchB
svn ci -F mergeB.msg -q
svn pg svnmerge-integrated
svnmerge.py avail
svnmerge.py avail /tmp/branchA
svnmerge.py avail /tmp/branchB
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
