code_junkie

Subversion : best way of moving changes from a branch to another

Nov 13th, 2011
93
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.64 KB | None | 0 0
  1. a) svn copy https://path/to/branches/X/x1 https://path/to/branches/Y/
  2. b) svn delete https://path/to/branches/Y/y1
  3. c) svn move https://path/to/branches/Y/x1 https://path/to/branches/Y/y1
  4.  
  5. svn delete https://path/to/branches/Y/y1
  6. svn copy https://path/to/branches/X/x1 https://path/to/branches/Y/y1
  7.  
  8. a) svn delete https://path/to/branches/Y/y1
  9. b) svn copy https://path/to/branches/X/x1 https://path/to/branches/Y/y1
  10.  
  11. svn co https://path/to/branches/Y Y
  12. cd Y
  13.  
  14. svn merge https://path/to/branches/Y/y1 https://path/to/branches/X/x1 y1
  15.  
  16. svn commit -m "Y/y1 now has the same contents as X/x1"
  17.  
  18. svn mv y1 x1
  19. svn commit -m "Y/y1 now named Y/x1"
Add Comment
Please, Sign In to add comment