[Svnmerge] problems with added files

[Konstantin Sobolev]

Hi,

I'm using svnmerge to merge changes from trunk to branch and observe
strange problems with newly added files: sometimes svnmerge doesn't
seem to notice them.

Recent example: there was a commit in trunk:

------------------------------------------------------------------------
r57244 | umbra | 2006-12-19 14:25:20 +0300 (Втр, 19 Дек 2006) | 1 line
Changed paths:
   A /java/trunk/projects/cachewrappers/src/com/supportwizard/cachewrappers/SWProjectRelatedCacheWrapper.java
   M /java/trunk/projects/dictionary/src/com/supportwizard/dictionary/SWProjectBean.java
   A /java/trunk/projects/gui2/src/com/supportwizard/gui2/beans/data/renderers/NoRecordDataException.java
   M /java/trunk/projects/gui2/src/com/supportwizard/gui2/beans/data/renderers/RecordRenderingContext.java
   M /java/trunk/projects/gui2/src/com/supportwizard/gui2/beans/data/renderers/URLRenderer.java
   M /java/trunk/projects/gui2/src/com/supportwizard/gui2/beans/hotlinks/HLUtils.java
   M /java/trunk/projects/gui2/src/com/supportwizard/gui2/beans/hotlinks/Hotlink4Rules.java
   M /java/trunk/projects/gui2/src/com/supportwizard/tests/gui2/RendersTest.java
   A /java/trunk/resources/jsp/openUrl.jsp

(m) 724 Render and Tracker
------------------------------------------------------------------------

note a couple of added files. Now I've used svnmerge to merge several
revisions, including this one. Here's corresponding log message from
the branch (sorry for verbose quoting):

------------------------------------------------------------------------
r57271 | kos | 2006-12-19 22:01:27 +0300 (Втр, 19 Дек 2006) | 33 lines
Changed paths:
   M /java/branches/release_2006_12
   M /java/branches/release_2006_12/build/misc.xml
   M /java/branches/release_2006_12/projects/dictionary/src/com/supportwizard/dictionary/SWProjectBean.java
   M /java/branches/release_2006_12/projects/functionalities/src/com/supportwizard/functionalities/dao3/ejb/SWDao3ClientUtilsBean.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/Constants.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/beans/data/importer/AbstractFileReader.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/beans/data/renderers/RecordRenderingContext.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/beans/data/renderers/URLRenderer.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/beans/hotlinks/HLUtils.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/beans/hotlinks/Hotlink4Rules.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/tags/controls/DefaultDrawableFactory.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/tags/controls/GUIDataTypeDAOField.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/tags/controls/GUIDataTypeTextField.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/gui2/tags/controls/GUIDataTypeURLField.java
   M /java/branches/release_2006_12/projects/gui2/src/com/supportwizard/tests/gui2/RendersTest.java
   M /java/branches/release_2006_12/resources/jsp/htmleditor/htmleditor.jsp
   M /java/branches/release_2006_12/resources/jsp/js/spectls/controls.jsp

Merged revisions
57243-57244,57246-57247,57250-57251,57253,57255-57258,57260-57263 via
svnmerge from
svn://svn.supportwizard.com/EW/java/trunk

........
  r57243 | grig | 2006-12-19 14:25:04 +0300 (Втр, 19 Дек 2006) | 1 line

  (m) #724
........
  r57244 | umbra | 2006-12-19 14:25:20 +0300 (Втр, 19 Дек 2006) | 1 line

  (m) 724 Render and Tracker
........
  r57253 | grig | 2006-12-19 17:15:43 +0300 (Втр, 19 Дек 2006) | 1 line

  (m) missed constants for URL type (#724)
........
  r57257 | gof | 2006-12-19 18:38:14 +0300 (Втр, 19 Дек 2006) | 1 line

  (m) small fix for #724
........
  r57258 | eugened | 2006-12-19 19:17:30 +0300 (Втр, 19 Дек 2006) | 1 line

  (m) misunderstood build number
........
  r57260 | serge | 2006-12-19 19:32:49 +0300 (Втр, 19 Дек 2006) | 1 line

  (m) #1365 - extra warnings removed
........
  r57263 | dmv | 2006-12-19 20:21:59 +0300 (Втр, 19 Дек 2006) | 1 line

  (m) 1988 -- Helper method in SWDao3ClientUtils for Boa
........

------------------------------------------------------------------------

As you can see, both added files were skipped. Why?

I've also seen another kind of problems when merging multiple
revisions at once: if some of revisions include the same files being
changed, merging like
svnmerge merge -r r1,r2,r3
can give a conflict. However, 3 separate invocations
svnmerge merge -r r1
svnmerge merge -r r2
svnmerge merge -r r3
result in a clean operation. I've seen it a couple of times but
details are lost now. I'll save more evidences next time it happens.

Thanks.
-- 
/KoS