Claus, Can you *please* make some more attempts to get a newer version of svnmerge.py working or use git cherry-pick or something that will retain the log? Not having the log entries on the branch makes is much harder to see what has and hasn't been merged onto the branch. For example, if you click on:
https://issues.apache.org/jira/browse/CAMEL-4478 it says Fix Version/s: 2.7.4, 2.8.2, 2.9.0 But the subversion tab doesn't have any entries for the branches. We'll really have no idea when the fix was merged back, the svn revision, etc.... Thanks! Dan On Saturday, October 01, 2011 8:47:08 AM davscl...@apache.org wrote: > Author: davsclaus > Date: Sat Oct 1 08:47:08 2011 > New Revision: 1177949 > > URL: http://svn.apache.org/viewvc?rev=1177949&view=rev > Log: > Merged revisions 1177948 via svnmerge from > https://svn.apache.org/repos/asf/camel/trunk > > > Modified: > camel/branches/camel-2.8.x/ (props changed) > > camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach > e/camel/component/printer/PrinterProducer.java > > Propchange: camel/branches/camel-2.8.x/ > ---------------------------------------------------------------------------- > -- --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat Oct 1 08:47:08 2011 > @@ -1 +1 @@ > -/camel/trunk:1177126,1177309,1177394,1177945 > +/camel/trunk:1177126,1177309,1177394,1177945,1177948 > > Propchange: camel/branches/camel-2.8.x/ > ---------------------------------------------------------------------------- > -- Binary property 'svnmerge-integrated' - no diff available. > > Modified: > camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach > e/camel/component/printer/PrinterProducer.java URL: > http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-pr > inter/src/main/java/org/apache/camel/component/printer/PrinterProducer.java? > rev=1177949&r1=1177948&r2=1177949&view=diff > =========================================================================== > === --- > camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach > e/camel/component/printer/PrinterProducer.java (original) +++ > camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach > e/camel/component/printer/PrinterProducer.java Sat Oct 1 08:47:08 2011 @@ > -87,7 +87,15 @@ public class PrinterProducer extends Def > printService = PrintServiceLookup.lookupDefaultPrintService(); > } else { > PrintService[] services = > PrintServiceLookup.lookupPrintServices(null, null); - > setPrinter("\\\\" + config.getHostname() + "\\" + config.getPrintername()); > + String name; > + if (config.getHostname().equalsIgnoreCase("localhost")) { > + // no hostname for localhost printers > + name = config.getPrintername(); > + } else { > + name = "\\\\" + config.getHostname() + "\\" + > config.getPrintername(); + } > + log.debug("Using printer name: {}", name); > + setPrinter(name); > int position = findPrinter(services, printer); > if (position < 0) { > throw new PrintException("No printer found with name: " + > printer + ". Please verify that the host and printer are registered and > reachable from this machine."); -- Daniel Kulp dk...@apache.org http://dankulp.com/blog Talend - http://www.talend.com
