[Dart-dev] svn:mergeinfo/ Revision: 12713

[dart at ucar.edu]

nancy at ucar.edu
2018-07-03 13:38:00 -0600 (Tue, 03 Jul 2018)
33
one more try at merge info fix.




Index: DART/branches/gigg
===================================================================
--- DART/branches/gigg	2018-07-03 19:34:24 UTC (rev 12712)
+++ DART/branches/gigg	2018-07-03 19:38:00 UTC (rev 12713)

Property changes on: DART/branches/gigg
___________________________________________________________________
Modified: svn:mergeinfo
## -39,7 +39,7 ##
 /DART/branches/rma_sprint:8093-8164
 /DART/branches/rma_state_structure_test_dir:9470-9674
 /DART/branches/rma_state_structure_unit_test:9689-10266
-/DART/branches/rma_trunk:11851-12707
+/DART/branches/rma_trunk:11851-12712
 /DART/branches/rma_trunk_clamping:8784-8799
 /DART/branches/rma_trunk_filename:8009-8155
 /DART/branches/rma_trunk_get_state_fun:8566-8594
Index: DART/branches/gigg/models/lorenz_96/work
===================================================================
--- DART/branches/gigg/models/lorenz_96/work	2018-07-03 19:34:24 UTC (rev 12712)
+++ DART/branches/gigg/models/lorenz_96/work	2018-07-03 19:38:00 UTC (rev 12713)

Property changes on: DART/branches/gigg/models/lorenz_96/work
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,57 ##
+/DART/branches/CM1/models/lorenz_96/work:8567-10316
+/DART/branches/bgrid_sprint/models/lorenz_96/work:8186-8237
+/DART/branches/bgrid_sprint_state_reorder/models/lorenz_96/work:8206-8250
+/DART/branches/development/models/lorenz_96/work:4672-6249
+/DART/branches/gitm/models/lorenz_96/work:5135-6209
+/DART/branches/gitm_lanai/models/lorenz_96/work:6563-6646
+/DART/branches/helen/models/lorenz_96/work:5987-6155
+/DART/branches/mmc/models/lorenz_96/work:12038-12269
+/DART/branches/model_mod_changes/models/lorenz_96/work:11401-11604
+/DART/branches/qc8/models/lorenz_96/work:12643-12657
+/DART/branches/rma_array_nml/models/lorenz_96/work:11814-11839
+/DART/branches/rma_cam_fv/models/lorenz_96/work:9550-9728
+/DART/branches/rma_cf_conventions/models/lorenz_96/work:9725-10086
+/DART/branches/rma_cice/models/lorenz_96/work:10647-10852
+/DART/branches/rma_clm/models/lorenz_96/work:8903-9126
+/DART/branches/rma_closest_member_tool/models/lorenz_96/work:12576-12617
+/DART/branches/rma_diag/models/lorenz_96/work:9621-9737
+/DART/branches/rma_fill_inf/models/lorenz_96/work:12517-12656
+/DART/branches/rma_fix_clm_restarts/models/lorenz_96/work:9634-11919
+/DART/branches/rma_fixed_filenames/models/lorenz_96/work:10700-10895
+/DART/branches/rma_kinds_to_state_structure/models/lorenz_96/work:8950-9431
+/DART/branches/rma_kinds_to_state_strucutre/models/lorenz_96/work:8901-8951
+/DART/branches/rma_mmc/models/lorenz_96/work:11723-11751
+/DART/branches/rma_model_mod_check/models/lorenz_96/work:8957-9172
+/DART/branches/rma_mpas_fold_mean_fwd/models/lorenz_96/work:9340-9452
+/DART/branches/rma_mpas_get_state_meta_data/models/lorenz_96/work:8863-8884
+/DART/branches/rma_netcdf_utils/models/lorenz_96/work:12424-12448
+/DART/branches/rma_obs_defs/models/lorenz_96/work:8915-9061
+/DART/branches/rma_output_files/models/lorenz_96/work:11439-11538
+/DART/branches/rma_par_msg/models/lorenz_96/work:9464-9505
+/DART/branches/rma_par_single_file/models/lorenz_96/work:11677-11773
+/DART/branches/rma_pop_variable_namelist/models/lorenz_96/work:8816-9150
+/DART/branches/rma_qc_fwd_op/models/lorenz_96/work:9642-9717
+/DART/branches/rma_refac_io/models/lorenz_96/work:9115-9540
+/DART/branches/rma_remove_groups_from_transpose/models/lorenz_96/work:9319-9449
+/DART/branches/rma_roms/models/lorenz_96/work:10149-10375
+/DART/branches/rma_set_filenames/models/lorenz_96/work:8377-8385
+/DART/branches/rma_single_file/models/lorenz_96/work:10896-11107
+/DART/branches/rma_sprint/models/lorenz_96/work:8093-8166
+/DART/branches/rma_state_structure_test_dir/models/lorenz_96/work:9470-9676
+/DART/branches/rma_state_structure_unit_test/models/lorenz_96/work:9689-10268
+/DART/branches/rma_trunk/models/lorenz_96/work:11851-12712
+/DART/branches/rma_trunk_clamping/models/lorenz_96/work:8784-8801
+/DART/branches/rma_trunk_filename/models/lorenz_96/work:8009-8157
+/DART/branches/rma_trunk_get_state_fun/models/lorenz_96/work:8566-8596
+/DART/branches/rma_trunk_mean_ens/models/lorenz_96/work:8514-8528
+/DART/branches/rma_trunk_mmc_fix/models/lorenz_96/work:9318-9337
+/DART/branches/rma_trunk_mpi_get_in_utils/models/lorenz_96/work:8559-8817
+/DART/branches/rma_trunk_pathnames/models/lorenz_96/work:8013-8028
+/DART/branches/rma_trunk_posterior/models/lorenz_96/work:9766-9781
+/DART/branches/rma_trunk_read_transpose/models/lorenz_96/work:9206-9250
+/DART/branches/rma_trunk_vert_loc/models/lorenz_96/work:8530-8537
+/DART/branches/rma_types_kinds/models/lorenz_96/work:11200-11236
+/DART/branches/rma_updates_nancy/models/lorenz_96/work:11613-11676
+/DART/branches/trunk_with_cam_style/models/lorenz_96/work:9465-9534
+/DART/releases/Manhattan/models/lorenz_96/work:11355-12592
+/DART/trunk/models/lorenz_96/work:6306-9550
\ No newline at end of property