Hello,
I have an svn problem I was hoping for some advice on.
I work at a company where 3 or more active branches always need to be
kept in sync. That means almost any change to the source code results
in 3 or more separate commits: 1 for the initial change and one for
each merge. Not only does this generate unecessary revisions, if
there is a problem with a change multiple revisions have to be rolled
back.
I want to be able to make a change, apply that change to multiple
branches and commit them all at once. The svn merge command needs to
work off a changeset, so I cannot use that to apply changes between
files. I tried doing something like the following:
hradtke_at_circus # svn checkout file:///svn/sandbox/branches advent
...
Checked out revision 32.
hradtke_at_circus # cd advent/branch3 && vi file2 -- make some change to file2
hradtke_at_circus # svn diff file2 ../branch4/file2 | patch ../branch4/file2
hradtke_at_circus # cd ../ && svn commit -m "commited change to file2 in
branch3 and branch4"
Unfortunately, that diff and patch command only works well when
changing one file. Trying to apply changes to multiple files is more
problematic. I could make a script that uses the output from the svn
status command, diff and apply each file found. However, I want to
make sure there is not an existing solution.
Anyone come across this problem before?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-24 16:09:56 CET