[prev in list] [next in list] [prev in thread] [next in thread]
List: svnmerge
Subject: [Svnmerge] svnmerge and multiple branch problems
From: "John Smith" <johnsmith71251 () gmail ! com>
Date: 2006-10-31 17:15:58
Message-ID: f376214d0610310915x3b3cab79gb910649cab2c4631 () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Hello,
I was quite excited when I found out about svnmerge. I'm hoping it will make
my life much easier. I've read the Wiki, Ken Kinder's tutorial, and much of
the mailing list. However, I've been struggling with it the past few days,
and I'm hoping someone might be able to assist. I thank you in advance.
I work at a small company (using rhel4/svn1.1.4) where our development
workflow basically goes like this:
- trunk is always stable and represents qa-tested/approved code
- a developer creates a branch off of trunk to do new development
- occasionally, a developer will merge trunk into his/her branch
- a developer will merge their branch into trunk after it has been approved
by qa
As it stands now, we're tracking revisions by-hand, and doing merges
manually. And, at any given time, there are multiple developers all doing
development in their own branches. I'm very much hoping that I can use
svnmerge to make the merging less painful and error-prone.
We're using the svnmerge.py from
http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py
Below is the sequence of commands and output--with annotations--of my
attempts with svnmerge. The end-result is an error condition; a property
conflict with svnmerge-integrated. I'd very much appreciate anyone who could
tell me what I'm doing wrong, or if I should be doing something differently.
Thanks again.
The main idea below is that: dev1 makes a change in her branch, merges it
into trunk, and then makes another change in her branch. dev2 creates a new
branch off of trunk. dev1 again merges her branch into trunk. dev2 tries to
merge trunk into her branch, but the operation fails.
[sarah@somewhere:~]$ # Create the repository
[sarah@somewhere:~]$ svnadmin create $HOME/.repo
[sarah@somewhere:~]$ # Create an environment variable pointing to the
repository
[sarah@somewhere:~]$ export REPO=svn+ssh://localhost/$HOME/.repo
[sarah@somewhere:~]$ # Make the conventional tags, branches, and trunk
directories
[sarah@somewhere:~]$ svn mkdir $REPO/tags $REPO/branches $REPO/trunk -m ""
Committed revision 1.
[sarah@somewhere:~]$ # Make the 1st branch and name it "first"
[sarah@somewhere:~]$ svn cp $REPO/trunk $REPO/branches/first -m ""
Committed revision 2.
[sarah@somewhere:~]$ # Create a container directory to hold trunk and our
branches and name it "testing"
[sarah@somewhere:~]$ mkdir testing
[sarah@somewhere:~]$ # Change directory to the container directory
[sarah@somewhere:~]$ cd testing
[sarah@somewhere:~/testing]$ # Check out trunk
[sarah@somewhere:~/testing]$ svn co $REPO/trunk
Checked out revision 2.
[sarah@somewhere:~/testing]$ # Check out the branch named "first"
[sarah@somewhere:~/testing]$ svn co $REPO/branches/first
Checked out revision 2.
[sarah@somewhere:~/testing]$ # Change directory to the directory containing
trunk
[sarah@somewhere:~/testing]$ cd trunk/
[sarah@somewhere:~/testing/trunk]$ # Initialize merge tracking for branch
"first" in trunk
[sarah@somewhere:~/testing/trunk]$ svnmerge init ../first/
property 'svnmerge-integrated' set on '.'
[sarah@somewhere:~/testing/trunk]$ # Commit
[sarah@somewhere:~/testing/trunk]$ svn ci -F svnmerge-commit-message.txt
Sending .
Committed revision 3.
[sarah@somewhere:~/testing/trunk]$ # Change directory to the directory
containing the branch "first"
[sarah@somewhere:~/testing/trunk]$ cd ../first/
[sarah@somewhere:~/testing/first]$ # Initialize merge tracking for trunk in
branch "first"
[sarah@somewhere:~/testing/first]$ svnmerge init ../trunk/
property 'svnmerge-integrated' set on '.'
[sarah@somewhere:~/testing/first]$ # Commit
[sarah@somewhere:~/testing/first]$ svn ci -F svnmerge-commit-message.txt
Sending .
Committed revision 4.
[sarah@somewhere :~/testing/first]$ # Then, Sarah creates a file in her
branch
[sarah@somewhere:~/testing/first]$ echo foo > foo
[sarah@somewhere:~/teting/first]$ # Adds it to subversion
[sarah@somewhere:~/testing/first]$ svn add foo
A foo
[sarah@somewhere:~/testing/first]$ # Then commits it
[sarah@somewhere:~/testing/first]$ svn ci foo -m ""
Adding foo
Transmitting file data .
Committed revision 5.
[sarah@somewhere :~/testing/first]$ # QA tells Sarah to merge her branch
"first" into trunk, so she changes to the directory containing trunk
[sarah@somewhere:~/testing/first]$ cd ../trunk/
[sarah@somewhere:~/testing/trunk]$ # Then checks what revisions are
available for merging
[sarah@somewhere:~/testing/trunk]$ svnmerge avail -ldb
svnmerge: changes in revision 5 follow
Index: foo
===================================================================
--- foo (revision 0)
+++ foo (revision 5)
@@ -0,0 +1 @@
+foo
[sarah@somewhere:~/testing/trunk]$ # Then she merges her change into trunk
[sarah@somewhere:~/testing/trunk]$ svnmerge merge -b
property 'svnmerge-integrated' set on '.'
A foo
property 'svnmerge-integrated' set on '.'
[sarah@somewhere:~/testing/trunk]$ svn update
At revision 5.
[sarah@somewhere:~/testing/trunk]$ # She checks in the merged changes
[sarah@somewhere :~/testing/trunk]$ svn ci -F svnmerge-commit-message.txt
Sending .
Adding foo
Committed revision 6.
[sarah@somewhere:~/testing/trunk]$ # Sarah changes directory to the branch
"first"
[sarah@somewhere:~/testing/trunk]$ cd ../first/
[sarah@somewhere:~/testing/first]$ # Then, she creates a new file..
[sarah@somewhere:~/testing/first]$ echo bar > bar
[sarah@somewhere:~/testing/first]$ # And, adds it to subversion
[sarah@somewhere:~/testing/first]$ svn add bar
A bar
[sarah@somewhere:~/testing/first]$ # Then commits it and goes out to lunch
[sarah@somewhere:~/testing/first]$ svn ci bar -m ""
Adding bar
Transmitting file data .
Committed revision 7.
[sarah@somewhere:~/testing/first]$ cd ..
[beth@somewhere:~/testing]$ # Meanwhile, Beth comes in to work and creates a
new branch named "second"
[beth@somewhere :~/testing]$ svn cp $REPO/trunk $REPO/branches/second -m ""
Committed revision 8.
[beth@somewhere:~/testing]$ # And checks out her branch named "second"
[beth@somewhere:~/testing]$ svn co $REPO/branches/second
A second/foo
U second
Checked out revision 8.
[beth@somewhere:~/testing]$ cd trunk/
[beth@somewhere:~/testing/trunk]$ # She inits merge tracking for branch
"second" in trunk
[beth@somewhere:~/testing/trunk]$ svnmerge init ../second/
property 'svnmerge-integrated' set on '.'
[beth@somewhere:~/testing/trunk]$ # And commits her change
[beth@somewhere:~/testing/trunk]$ svn ci -F svnmerge-commit-message.txt
Sending .
Committed revision 9.
[beth@somewhere:~/testing/trunk]$ cd ../second/
[beth@somewhere:~/testing/second]$ # Then, she inits merge tracking for
trunk in the "second" branch
[beth@somewhere:~/testing/second]$ svnmerge init ../trunk/
property 'svnmerge-integrated' set on '.'
[beth@somewhere:~/testing/second]$ # And, commits that..
[beth@somewhere:~/testing/second]$ svn ci -F svnmerge-commit-message.txt
Sending .
Committed revision 10.
[beth@somewhere:~/testing/second]$ cd ../trunk/
[sarah@somewhere:~/testing/trunk]$ # QA tells the 1st developer, Sarah, to
merge her latest change into trunk..
[sarah@somewhere:~/testing/trunk]$ svnmerge avail -lb --head branches/first
------------------------------------------------------------------------
r7 | someone | 2006-10-27 17:23:16 -0400 (Fri, 27 Oct 2006) | 1 line
Changed paths:
A /branches/first/bar
[sarah@somewhere:~/testing/trunk]$ # So, she does..
[sarah@somewhere:~/testing/trunk]$ svnmerge merge -b --head branches/first
property 'svnmerge-integrated' set on '.'
A bar
property 'svnmerge-integrated' set on '.'
[sarah@somewhere:~/testing/trunk]$ svn update
At revision 10.
[sarah@somewhere:~/testing/trunk]$ # Then, Sarah commits the merge
[sarah@somewhere:~/testing/trunk]$ svn ci -F svnmerge-commit-message.txt
Sending .
Adding bar
Committed revision 11.
[beth@somewhere:~/testing/trunk]$ # Beth wants to update her branch "second"
with the latest changes from Sarah that are now in trunk...
[beth@somewhere:~/testing/trunk]$ cd ../second/
[beth@somewhere:~/testing/second]$ # Beth looks to see what is available..
[beth@somewhere:~/testing/second]$ svnmerge avail -lb --head trunk
------------------------------------------------------------------------
r11 | someone | 2006-10-27 17:26:17 -0400 (Fri, 27 Oct 2006) | 7 lines
Changed paths:
M /trunk
A /trunk/bar (from /branches/first/bar:7)
Merged revisions 6-10 via svnmerge from
svn+ssh://somewhere/home/someone/.repo/branches/first
........
r7 | someone | 2006-10-27 17:23:16 -0400 (Fri, 27 Oct 2006) | 1 line
........
[beth@somewhere:~/testing/second]$ svnmerge avail -lbd --head trunk
svnmerge: changes in revision 11 follow
Index: bar
===================================================================
--- bar (revision 0)
+++ bar (revision 11)
@@ -0,0 +1 @@
+bar
Property changes on:
___________________________________________________________________
Name: svnmerge-integrated
+ /branches/first:1-10 /branches/second:1-8
[beth@somewhere:~/testing/second]$ # And, then, unsuccessfully tries to
merge it in :-(
[beth@somewhere:~/testing/second]$ svnmerge merge -b --head trunk
property 'svnmerge-integrated' set on '.'
A bar
C .
property 'svnmerge-integrated' set on '.'
[beth@somewhere:~/testing/second]$ svn diff
Property changes on:
___________________________________________________________________
Name: svnmerge-integrated
- /branches/first:1-5 /trunk:1-9
+ /branches/first:1-5 /trunk:1-11
[beth@somewhere:~/testing/second]$ more dir_conflicts.prej
Property 'svnmerge-integrated' locally changed to '/branches/first:1-5
/branches/second:1-8', but update sets it to '/branches/first:1-10
/branches/second:1-8'
[beth@somewhere:~/testing/second]$
PS: Sent this to the list a few days ago, but it didn't seem to get
through--retrying
[Attachment #5 (text/html)]
Hello,<br><br>I was quite excited when I found out about svnmerge. I'm hoping it will \
make my life much easier. I've read the Wiki, Ken Kinder's tutorial, and much of the \
mailing list. However, I've been struggling with it the past few days, and I'm hoping \
someone might be able to assist. I thank you in advance. <br><br>I work at a small \
company (using rhel4/svn1.1.4) where our development workflow basically goes like \
this:<br><br>- trunk is always stable and represents qa-tested/approved code<br>- a \
developer creates a branch off of trunk to do new development <br>- occasionally, a \
developer will merge trunk into his/her branch<br>- a developer will merge their \
branch into trunk after it has been approved by qa<br><br>As it stands now, we're \
tracking revisions by-hand, and doing merges manually. And, at any given time, there \
are multiple developers all doing development in their own branches. I'm very much \
hoping that I can use svnmerge to make the merging less painful and error-prone. \
<br><br>We're using the svnmerge.py from <a \
href="http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py" \
target="_blank" onclick="return \
top.js.OpenExtLink(window,event,this)">http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py
</a><br><br>Below is the sequence of commands and output--with annotations--of my \
attempts with svnmerge. The end-result is an error condition; a property conflict \
with svnmerge-integrated. I'd very much appreciate anyone who could tell me what I'm \
doing wrong, or if I should be doing something differently. Thanks again. <br><br>The \
main idea below is that: dev1 makes a change in her branch, merges it into trunk, and \
then makes another change in her branch. dev2 creates a new branch off of trunk. dev1 \
again merges her branch into trunk. dev2 tries to merge trunk into her branch, but \
the operation fails. <br><br>[sarah@somewhere:~]$ # Create the \
repository<br>[sarah@somewhere:~]$ svnadmin create \
$HOME/.repo<br>[sarah@somewhere:~]$ # Create an environment variable pointing to the \
repository<br>[sarah@somewhere:~]$ export REPO=svn+ssh://localhost/$HOME/.repo \
<br>[sarah@somewhere:~]$ # Make the conventional tags, branches, and trunk \
directories<br>[sarah@somewhere:~]$ svn mkdir $REPO/tags $REPO/branches $REPO/trunk \
-m ""<br>Committed revision 1.<br>[sarah@somewhere:~]$ # Make the 1st \
branch and name it "first" <br>[sarah@somewhere:~]$ svn cp $REPO/trunk \
$REPO/branches/first -m ""<br>Committed revision 2.<br>[sarah@somewhere:~]$ \
# Create a container directory to hold trunk and our branches and name it \
"testing" <br>[sarah@somewhere:~]$ mkdir testing<br>[sarah@somewhere:~]$ # \
Change directory to the container directory<br>[sarah@somewhere:~]$ cd \
testing<br>[sarah@somewhere:~/testing]$ # Check out \
trunk<br>[sarah@somewhere:~/testing]$ svn co $REPO/trunk <br>Checked out revision \
2.<br>[sarah@somewhere:~/testing]$ # Check out the branch named \
"first"<br>[sarah@somewhere:~/testing]$ svn co \
$REPO/branches/first<br>Checked out revision 2.<br>[sarah@somewhere:~/testing]$ # \
Change directory to the directory containing trunk <br>[sarah@somewhere:~/testing]$ \
cd trunk/<br>[sarah@somewhere:~/testing/trunk]$ # Initialize merge tracking for \
branch "first" in trunk<br>[sarah@somewhere:~/testing/trunk]$ svnmerge init \
../first/<br>property 'svnmerge-integrated' set on '.' \
<br>[sarah@somewhere:~/testing/trunk]$ # Commit<br>[sarah@somewhere:~/testing/trunk]$ \
svn ci -F svnmerge-commit-message.txt<br>Sending \
.<br>Committed revision 3.<br>[sarah@somewhere:~/testing/trunk]$ # Change directory \
to the directory containing the branch "first" \
<br>[sarah@somewhere:~/testing/trunk]$ cd \
../first/<br>[sarah@somewhere:~/testing/first]$ # Initialize merge tracking for trunk \
in branch "first"<br>[sarah@somewhere:~/testing/first]$ svnmerge init \
../trunk/<br>
property 'svnmerge-integrated' set on '.'<br>[sarah@somewhere:~/testing/first]$ # \
Commit<br>[sarah@somewhere:~/testing/first]$ svn ci -F \
svnmerge-commit-message.txt<br>Sending \
.<br>Committed revision 4.<br>[sarah@somewhere
> ~/testing/first]$ # Then, Sarah creates a file in her \
> branch<br>[sarah@somewhere:~/testing/first]$ echo foo > \
> foo<br>[sarah@somewhere:~/teting/first]$ # Adds it to \
> subversion<br>[sarah@somewhere:~/testing/first]$ svn add foo
<br>A \
foo<br>[sarah@somewhere:~/testing/first]$ # Then commits \
it<br>[sarah@somewhere:~/testing/first]$ svn ci foo -m \
""<br>Adding \
foo<br>Transmitting file data .<br>Committed revision 5.<br>[sarah@somewhere
> ~/testing/first]$ # QA tells Sarah to merge her branch "first" into \
> trunk, so she changes to the directory containing \
> trunk<br>[sarah@somewhere:~/testing/first]$ cd \
> ../trunk/<br>[sarah@somewhere:~/testing/trunk]$ # Then checks what revisions are \
> available for merging
<br>[sarah@somewhere:~/testing/trunk]$ svnmerge avail -ldb<br><br>svnmerge: changes \
in revision 5 follow<br><br>Index: \
foo<br>===================================================================<br>--- foo \
(revision 0)<br>
+++ foo (revision 5)<br>@@ -0,0 +1 \
@@<br>+foo<br><br>[sarah@somewhere:~/testing/trunk]$ # Then she merges her change \
into trunk<br>[sarah@somewhere:~/testing/trunk]$ svnmerge merge -b<br>property \
'svnmerge-integrated' set on '.' <br><br>A foo<br><br>property \
'svnmerge-integrated' set on '.'<br><br>[sarah@somewhere:~/testing/trunk]$ svn \
update<br>At revision 5.<br>[sarah@somewhere:~/testing/trunk]$ # She checks in the \
merged changes<br>[sarah@somewhere
> ~/testing/trunk]$ svn ci -F \
> svnmerge-commit-message.txt<br>Sending \
> .<br>Adding foo<br><br>Committed \
> revision 6.<br>[sarah@somewhere:~/testing/trunk]$ # Sarah changes directory to the \
> branch "first"
<br>[sarah@somewhere:~/testing/trunk]$ cd \
../first/<br>[sarah@somewhere:~/testing/first]$ # Then, she creates a new \
file..<br>[sarah@somewhere:~/testing/first]$ echo bar > \
bar<br>[sarah@somewhere:~/testing/first]$ # And, adds it to subversion \
<br>[sarah@somewhere:~/testing/first]$ svn add \
bar<br>A \
bar<br>[sarah@somewhere:~/testing/first]$ # Then commits it and goes out to \
lunch<br>[sarah@somewhere:~/testing/first]$ svn ci bar -m \
""<br>Adding bar \
<br>Transmitting file data .<br>Committed revision \
7.<br>[sarah@somewhere:~/testing/first]$ cd ..<br>[beth@somewhere:~/testing]$ # \
Meanwhile, Beth comes in to work and creates a new branch named \
"second"<br>[beth@somewhere
> ~/testing]$ svn cp $REPO/trunk $REPO/branches/second -m ""<br>Committed \
> revision 8.<br>[beth@somewhere:~/testing]$ # And checks out her branch named \
> "second"<br>[beth@somewhere:~/testing]$ svn co $REPO/branches/second
<br>A second/foo<br> U second<br>Checked out revision \
8.<br>[beth@somewhere:~/testing]$ cd trunk/<br>[beth@somewhere:~/testing/trunk]$ # \
She inits merge tracking for branch "second" in trunk<br>[beth@somewhere \
:~/testing/trunk]$ svnmerge init ../second/ <br>property 'svnmerge-integrated' set on \
'.'<br>[beth@somewhere:~/testing/trunk]$ # And commits her \
change<br>[beth@somewhere:~/testing/trunk]$ svn ci -F \
svnmerge-commit-message.txt<br>Sending \
.<br>Committed revision 9. <br>[beth@somewhere:~/testing/trunk]$ cd \
../second/<br>[beth@somewhere:~/testing/second]$ # Then, she inits merge tracking for \
trunk in the "second" branch<br>[beth@somewhere:~/testing/second]$ svnmerge \
init ../trunk/ <br>property 'svnmerge-integrated' set on \
'.'<br>[beth@somewhere:~/testing/second]$ # And, commits \
that..<br>[beth@somewhere:~/testing/second]$ svn ci -F \
svnmerge-commit-message.txt<br>Sending \
.<br>Committed revision 10. <br>[beth@somewhere:~/testing/second]$ cd \
../trunk/<br>[sarah@somewhere:~/testing/trunk]$ # QA tells the 1st developer, Sarah, \
to merge her latest change into trunk..<br>[sarah@somewhere:~/testing/trunk]$ \
svnmerge avail -lb --head branches/first \
<br>------------------------------------------------------------------------<br>r7 | \
someone | 2006-10-27 17:23:16 -0400 (Fri, 27 Oct 2006) | 1 line<br>Changed \
paths:<br> A /branches/first/bar<br>[sarah@somewhere:~/testing/trunk]$ # \
So, she does.. <br>[sarah@somewhere:~/testing/trunk]$ svnmerge merge -b --head \
branches/first<br>property 'svnmerge-integrated' set on '.'<br><br>A \
bar<br><br>property 'svnmerge-integrated' set on \
'.'<br><br>[sarah@somewhere:~/testing/trunk]$ svn update <br>At revision \
10.<br>[sarah@somewhere:~/testing/trunk]$ # Then, Sarah commits the \
merge<br>[sarah@somewhere:~/testing/trunk]$ svn ci -F \
svnmerge-commit-message.txt<br>Sending \
.<br>Adding bar<br><br>Committed \
revision 11. <br>[beth@somewhere:~/testing/trunk]$ # Beth wants to update her branch \
"second" with the latest changes from Sarah that are now in \
trunk...<br>[beth@somewhere:~/testing/trunk]$ cd ../second/<br>[beth@somewhere \
:~/testing/second]$ # Beth looks to see what is available.. \
<br>[beth@somewhere:~/testing/second]$ svnmerge avail -lb --head \
trunk<br>------------------------------------------------------------------------<br>r11 \
| someone | 2006-10-27 17:26:17 -0400 (Fri, 27 Oct 2006) | 7 lines <br>
Changed paths:<br> M /trunk<br> A /trunk/bar (from \
/branches/first/bar:7)<br><br>Merged revisions 6-10 via svnmerge \
from<br>svn+ssh://somewhere/home/someone/.repo/branches/first<br><br>........<br> \
r7 | someone | 2006-10-27 17:23:16 -0400 (Fri, 27 Oct 2006) | 1 line \
<br>........<br><br><br>[beth@somewhere:~/testing/second]$ svnmerge avail -lbd --head \
trunk<br><br>svnmerge: changes in revision 11 follow<br><br>Index: \
bar<br>=================================================================== <br>--- \
bar (revision 0)<br>+++ bar (revision 11)<br>@@ -0,0 +1 @@<br>+bar<br><br>Property \
changes on:<br>___________________________________________________________________<br>Name: \
svnmerge-integrated<br> + /branches/first:1-10 /branches/second:1-8 \
<br>[beth@somewhere:~/testing/second]$ # And, then, unsuccessfully tries to merge it \
in :-( <br>[beth@somewhere:~/testing/second]$ svnmerge merge -b --head \
trunk<br>property 'svnmerge-integrated' set on '.'<br><br>A bar <br>
C .<br><br>property 'svnmerge-integrated' set on \
'.'<br><br>[beth@somewhere:~/testing/second]$ svn diff<br><br>Property changes \
on:<br>___________________________________________________________________<br>Name: \
svnmerge-integrated <br> - /branches/first:1-5 /trunk:1-9<br> \
+ /branches/first:1-5 /trunk:1-11<br><br>[beth@somewhere:~/testing/second]$ more \
dir_conflicts.prej<br>Property 'svnmerge-integrated' locally changed to \
'/branches/first:1-5 /branches/second:1-8', but update sets it to \
'/branches/first:1-10 /branches/second:1-8' <br>[beth@somewhere:~/testing/second]$ \
<br><br>PS: Sent this to the list a few days ago, but it didn't seem to get \
through--retrying<br><br>
_______________________________________________
Svnmerge mailing list
Svnmerge@orcaware.com
http://www.orcaware.com/mailman/listinfo/svnmerge
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic