slub.team team mailing list archive

[Ralf Claussnitzer <ralf.claussnitzer@xxxxxxxxxxxxxxx>]

Review: Disapprove

1- This branch is related to a particular bug but fixes many unrelated things as well.
2- It cannot be merged (see merge result below).

Please provide smaller commits in your branches, as well as branches related to a _single_ bug or blueprint. Thank you!

>>>>>

$ bzr merge lp:~zeutschel/goobi-production/refactoring-messages
+N  src/de/sub/goobi/helper/Messages.java                                                                                                                                                                     
 M  newpages/inc/box_Kopf.jsp
 M  newpages/inc/box_head.jsp
 M  newpages/inc/head.jsp
 M  newpages/inc/tbl_Kopf.jsp
 M  newpages/inc_AktuelleSchritte/Schritte_Liste.jsp
 M  newpages/inc_Prozessverwaltung/Context_Prozesse_Liste.jsp
 M  newpages/inc_Prozessverwaltung/Prozesse_Liste.jsp
 M  newpages/inc_Prozessverwaltung/prozess_box_Schritte.jsp
 M  pages/Metadaten2oben.jsp
 M  src/de/sub/goobi/beans/Prozess.java
 M  src/de/sub/goobi/beans/Schritt.java
 M  src/de/sub/goobi/config/ConfigMain.java
 M  src/de/sub/goobi/export/dms/ExportDms.java
 M  src/de/sub/goobi/forms/AktuelleSchritteForm.java
 M  src/de/sub/goobi/forms/BenutzerverwaltungForm.java
 M  src/de/sub/goobi/forms/HelperForm.java
 M  src/de/sub/goobi/forms/LoginForm.java
 M  src/de/sub/goobi/forms/ProzesskopieForm.java
 M  src/de/sub/goobi/forms/ProzessverwaltungForm.java
 M  src/de/sub/goobi/forms/SpracheForm.java
 M  src/de/sub/goobi/helper/Helper.java
 M  src/de/sub/goobi/helper/enums/HistoryEventType.java
 M  src/de/sub/goobi/helper/enums/StepEditType.java
 M  src/de/sub/goobi/helper/enums/StepStatus.java
 M  src/de/sub/goobi/helper/exceptions/GUIExceptionWrapper.java
 M  src/de/sub/goobi/helper/servletfilter/RequestControlFilter.java
 M  src/de/sub/goobi/metadaten/Metadaten.java
 M  src/de/sub/goobi/persistence/HibernateSessionConversationFilter.java
 M  src/de/sub/goobi/persistence/HibernateSessionConversationFilterWithoutTransaction.java
-   src/messages/
-D  src/messages/Messages.java
-D  src/messages/intmessages.properties
RM  src/messages/messages_de.properties => config/messages_de.properties
RM  src/messages/messages_en.properties => config/messages_en.properties
 M  src/org/goobi/production/flow/statistics/enums/CalculationUnit.java
 M  src/org/goobi/production/flow/statistics/enums/ResultOutput.java
 M  src/org/goobi/production/flow/statistics/enums/StatisticsMode.java
 M  src/org/goobi/production/flow/statistics/enums/TimeUnit.java
 M  src/org/goobi/production/flow/statistics/hibernate/StatQuestCorrections.java
 M  src/org/goobi/production/flow/statistics/hibernate/StatQuestProduction.java
 M  src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectAssociations.java
 M  src/org/goobi/production/flow/statistics/hibernate/StatQuestProjectProgressData.java
 M  src/org/goobi/production/flow/statistics/hibernate/StatQuestStorage.java
 M  src/org/goobi/production/flow/statistics/hibernate/StatQuestThroughput.java
 M  src/org/goobi/production/flow/statistics/hibernate/StatQuestUsergroups.java
 M  src/org/goobi/production/flow/statistics/hibernate/StatQuestVolumeStatus.java
Conflict: can't delete src/messages because it is not empty.  Not deleting.
1 conflicts encountered.
-- 
https://code.launchpad.net/~zeutschel/goobi-production/refactoring-messages/+merge/103284
Your team Saxon State Library Team is subscribed to branch lp:goobi-production.