Merge missed commits

Question

Recently I met a problem while merging code with svn. Here is the scenario:

1. trunk -> branch (merge)

   • cd my_project_branch
   • svn merge https://subversion.assembla.com/svn/my_project/trunk/my_project ~/workspaceAssembla/my_project_branch
   • svn commit -m "1. trunk -> branch" *

2. made changes on branch

   • cd my_project_branch
   • svn commit -m "2. made changes on branch" *

3. branch -> trunk (merge)

   • cd my_project_trunk
   • svn merge --reintegrate https://subversion.assembla.com/svn/my_project/branches/my_project ~/workspaceAssembla/my_project_trunk
   • svn commit -m "3. branch -> trunk (merge)" *

4. made changes on trunk

   • cd my_project_trunk
   • svn commit -m "4. made changes on trunk" *
5. trunk -> branch (merge but forgot one change!) [i.e. merged change was NOT committed to branch]
   • cd my_project_branch
   • svn merge https://subversion.assembla.com/svn/my_project/trunk/my_project ~/workspaceAssembla/my_project_branch
   • svn commit -m "5. trunk -> branch (merge but forgot one change!)" * (not all files were committed!!!)
6. look at branch
7. figure out something is missed

8. try to merge trunk -> branch again to resolve the missed things

   • cd my_project_branch
   • svn merge https://subversion.assembla.com/svn/my_project/trunk/my_project ~/workspaceAssembla/my_project_branch

9. bump! No changes to merge!

In other words I can see that I have a change at trunk that should be at branch but I can't merge it for this moment (because it was partially merged). Is there some remedy for this?

Answer 1

If you have an exact set of commands that duplicates this scenario I'd be interested in seeing it (start with a new repo and go from there). If so with what version of Subversion did you duplicate it.

That said, if you want to merge something that Subversion is ignoring it's probably due to mergeinfo. In this case you probably can just do a cherry-pick merge with --ignore-ancestry i.e. svn merge -c 1234 --ignore-ancestry ^/trunk where revision r1234 is the one that has the change you want to merge.