I think this trunk-to-branch interior merge should be clean, but the merge logic correctly identifies some missing files in the reposurgeon output (checked in -pre7 and -pre4). They are in SVN on that branch, though (ignoring .gitignore for the time being). I only see one java file in scripts/java/jNut/src/main/java/org/networkupstools/jnut/ from reposurgeon.
http://trac.networkupstools.org/projects/nut/browser/branches/windows_port/scripts/java/jNut/src/main/java/org/networkupstools/jnut?rev=3319 trunk -> windows_port: 2011-11-15T10:14:[email protected] ("Merge from trunk 2011-06-27T13:56:[email protected]"...) - trunk parent: 2011-11-12T13:48:[email protected] ("Add upsmgBatteryLowCondition OID to the status mapping") - windows_port parent: 2011-08-11T06:39:[email protected] ("Correct handling of timeout") reposurgeon% merge /Add upsmgBatteryLowCondition OID to the status mapping/|/Merge from trunk 2011-06-27T13:56:[email protected]/ reposurgeon: :12157 cannot merge clean at target :12183 reposurgeon: target :12183 is missing these files: scripts/java/.gitignore scripts/java/jNut/src/main/java/org/networkupstools/jnut/StringLineSocket.java docs/man/mge-utalk.txt [and many more] (Don't get me wrong: we don't necessarily need to identify every single trunk merge into windows_port, but as I understand it, identifying those merge points will save our sanity if we ever try to merge that branch back into the trunk with Git. We may have to do an interactive rebase on the latest trunk to clean up the patch set, but that's more of an issue with the SVN merge process.) still trying to find more merge points... -- Charles Lepple clepple@gmail _______________________________________________ Nut-upsdev mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/nut-upsdev
