svn merge for a file

Given a file, merge trunk to branch or branch to trunk

  • Under branch, “svn update;svn log foo” to find out the last revision number such as 70428
  • Under trunk, “svn update;svn log foo” to find out the last revision number such as 69001
  • Dry run: svn merge –dry-run -r 69001:70428 https://svn.blah.com/branchpath_to_foo/foo to make sure.
  • Real run. 
Advertisements
This entry was posted in svn. Bookmark the permalink.

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s