Changes between Version 1 and Version 2 of SvnMerging

Timestamp:

01/17/07 21:46:56 (17 years ago)

Author:

csherwood

Comment:

--

SvnMerging

@@ -3 +3 @@
  * '''Why merge?''' Merging one way or another is the only way to combine two different versions of the code. It can be done manually or using the svn merge command.
 
- * '''Manually is probably best.''' Use svn or Winmerge to check for modifications, but combine files using hand edits, ideally with a tool like Winmerge or Emacs.
+ * '''Subversion is not smart.''' svn only compares text changes within segments of files. If there is no apparent conflict, it will perform the merge. It does not, and cannot, understand changes that are related to logical changes (for example, changes to the meaning of a variable, or the type of a variable that is declared somewhere else.
+
+ * '''Manually is usually best.''' Use svn or Winmerge to check for modifications, but combine files using hand edits, ideally with a tool like Winmerge or Emacs.
 
  * '''Sometimes automatic is more appropriate.''' For example, if you want to add the new copyright statements and reference to licence.txt into every file in your branch, like the trunk does now, and you have otherwise not changed much in your branch, it is ''way'' quicker to use svn merge.
 
- * '''Svn merge is not what you think.''' The syntax is not intuiti
+ * '''Svn merge is not what you think.''' The syntax is not intuitive...in particular, the 
+{{{
+From:
+}}}
+ and {{{
+To:
+}}} sections of the GUI do not mean what you think. '''Both''' refer to the code ''from which'' you will get your changes. The code ''to which'' your changes will be made (pending any conflicts) is the working copy...determined by context (where you did the right-click) in the GUI.