Clever Geek Handbook

Do I need to merge SVN branches in sequence?

I used svn_load_dirs.pl

to create vendor branches and I have the following versions in my vendor branch

  • 1.2.0.1/
  • 1.2.1.2/
  • 1.3.0 /
  • 1.3.1 /
  • 1.3.1.1/
  • 1.3.2 /
  • 1.3.2.1/
  • 1.3.2.2/
  • 1.3.2.3/
  • 1.3.2.4/
  • current /

If my working copy is at version 1.3.2 , can I go from that version to 1.3.2.4 with a single command svn merge

? Or do I need to do svn merge

for each version from 1.3.2 to 1.3.2.4?

+2


source to share


1 answer


Yes, you can do it with one svn merge

. If there are many conflicts between vendor branches and trunks, they may find it easier to perform multiple small merges.



You can always try merging with --dry-run

; if there are indiscriminate conflicts then merge each vendor revision separately.

+2


source






More articles:


All Articles