Can't synchronize branch with trunk
Hi I've encountered a strange problem, hopefully someone can help me here. Below is a diagram of our repo -trunk--mod ABC-+ + | | | branch-copy WPB---Mods XYZ---+ 1. From trunk we created a copy to a new dev branch for workpackage-B. 2. Commits XYZ where made to branch WPB 3. In parallel, mods ABC where made to trunk 4. When trying to bring changes into WPB via merge, none of the changes are seen. They are basically ignored. I've tried cherry picking as well, but this synchronization merge isn't working. What could be wrong here? This is the output from my eclipse IDE, the same happens from the commandline: Operation Resource Path - --- Modified/home/kiren/Documents/workspace-QA/V2.1.0-work-package-B merge completed/home/kiren/Documents/workspace-QA/V2.1.0-work-package-B Regards Kiren Pillay
Splitting out project from repo
I've a repository that's grown incredibly big and we're going to start
breaking out each project in the repo to separate repos. However I've
ran into a couple of issues in regards of Node-copyfrom-rev which
doesn't match up properly upon dump/load resulting in the following:
svnadmin: E160006: Relative source revision -18169 is not available in
current repository
svnadmin: E160013: File not found: transaction '37-1c', path
'tags/1.6.1/file.php'
I've done some efforts to rewrite the dump-files and
revision-definitions but it doesn't seem to match up properly making
it hard to automate the process. Any suggestions of changes are
welcome, please notice however that using svndumpfilter isn't really
an option due to the size of the repo it takes hours to break out just
a single project and this repo contains several thousand.
#!/bin/bash
project=$1
repo=/root/svn-copy/oldrepo
rm -fr $project*
mkdir $project
cd $project
svnadmin create $project
i=1
svn log file://$repo $project | grep -e .*r[0-9].*|.* | awk '{ print
substr($1,2) }' | sort -g | while read rev; do
revs[$rev]=$i
svnadmin dump $repo --quiet -r $rev --incremental $project.$rev.bak
# Rewrite revision number to ease rewrite of Node-copyfrom
perl -pi -e s/Revision-number: $rev/Revision-number: $i/; $project.$rev.bak
# Rewrite node-paths
perl -pi -e s/Node-path: $project\//Node-path: /; $project.$rev.bak
# Rewrite Node-copyfrom-path
perl -pi -e s/Node-copyfrom-path: $project\//Node-copyfrom-path: /;
$project.$rev.bak
# Rewrite Node-copyfrom-rev
for rev in $(grep Node-copyfrom-rev $project.$i.bak | awk '{ print $2 }'); do
perl -pi -e s/Node-copyfrom-rev: $rev/Node-copyfrom-rev:
${revs[$rev]}/; $project.$i.bak
done
# Remove prop for old project-folder
sed -i /Node-path: $project/,/PROPS-END/d $project.$rev.bak
svnadmin load --ignore-uuid $project $project.$rev.bak
let i=$i+1
rm -fr $project.$rev.bak
done
svnadmin setuuid $project
Please notice that the rewrite of the revision-numbers has mitigated
the node-copyfrom-rev somewhat but not entirely as it seems like
node-copyfrom-repo points incorrectly sometimes when dumping this way.
Best
RE: Can't synchronize branch with trunk
Hi I've encountered a strange problem, hopefully someone can help me here. Below is a diagram of our repo -trunk--mod ABC-+ + | | | branch-copy WPB---Mods XYZ---+ 1. From trunk we created a copy to a new dev branch for workpackage-B. 2. Commits XYZ where made to branch WPB 3. In parallel, mods ABC where made to trunk 4. When trying to bring changes into WPB via merge, none of the changes are seen. They are basically ignored. I've tried cherry picking as well, but this synchronization merge isn't working. What could be wrong here? This is the output from my eclipse IDE, the same happens from the commandline: Operation Resource Path - --- Modified /home/kiren/Documents/workspace-QA/V2.1.0-work-package-B merge completed /home/kiren/Documents/workspace-QA/V2.1.0-work- package-B It's really difficult to tell here from the limited information. I assume Eclipse uses the svn libs rather than show you the command line. Can you run the command from the command line using svn.exe, show us your command and the output?
Re: Can't synchronize branch with trunk
Hi Bob, Its a standard merge command, that's why I haven't included it. Its a standard merge though, it should work as far as I know. Was wondering in what cases this issue would occur. I will try and get the logs for you. Regards Kiren On Fri, Mar 1, 2013 at 8:33 PM, Bob Archer bob.arc...@amsi.com wrote: Hi I've encountered a strange problem, hopefully someone can help me here. Below is a diagram of our repo -trunk--mod ABC-+ + | | | branch-copy WPB---Mods XYZ---+ 1. From trunk we created a copy to a new dev branch for workpackage-B. 2. Commits XYZ where made to branch WPB 3. In parallel, mods ABC where made to trunk 4. When trying to bring changes into WPB via merge, none of the changes are seen. They are basically ignored. I've tried cherry picking as well, but this synchronization merge isn't working. What could be wrong here? This is the output from my eclipse IDE, the same happens from the commandline: Operation Resource Path - --- Modified/home/kiren/Documents/workspace-QA/V2.1.0-work-package-B merge completed/home/kiren/Documents/workspace-QA/V2.1.0-work- package-B It's really difficult to tell here from the limited information. I assume Eclipse uses the svn libs rather than show you the command line. Can you run the command from the command line using svn.exe, show us your command and the output?
