On Mon, May 10, 2010 at 12:12:49PM -0400, Peter Kahn wrote: > People use the this merge pattern > > a) PULL - merge trunk-to-branch, resolve, test, commit > > b) PUSH - merge branch-to-trunk, resolve, test, commit > > c) Recreate branch (or usually create new story branch and drop old since > it's done)
PULL, PUSH, and Recreate branch could be anything. Can you describe the exact commands (or button clicks) you are using at each of these steps? Without that information it's pretty much impossible to tell what the root of your problem might be. Also, if you could provide your complete mergeinfo that would help: svn propget -R -v svn:mergeinfo $REPOS_URL > allmergeinfo.txt Even if it's a lot of output, post all of it. You can do search/replace operations on pathnames which are confidential if you need to. Thanks, Stefan
