Displaying 1 result from an estimated 1 matches for "stringlinesocket".
2012 Jan 11
0
Missing files on windows_port branch
...owCondition OID to the status mapping/|/Merge from trunk 2011-06-27T13:56:51Z!fbohe-guest at alioth.debian.org/
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. W...