widelands-dev team mailing list archive

Thread
Date
[Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands

To: mp+366614@xxxxxxxxxxxxxxxxxx
From: bunnybot <widelandsofficial@xxxxxxxxx>
Date: Mon, 27 May 2019 07:51:43 -0000
In-reply-to: <155644484170.15631.1515514599277309442.launchpad@ackee.canonical.com>
Reply-to: mp+366614@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
Error merging this proposal:

Output:
stdout:

stderr:
R   data/music/intro_00.ogg => data/music/intro.ogg
R   data/music/menu_00.ogg => data/music/menu.ogg
 M  data/scripting/mapobjects.lua
R   data/sound/animals/boar_01.ogg => data/sound/animals/boar.ogg
R   data/sound/animals/coyote_01.ogg => data/sound/animals/coyote_00.ogg
R   data/sound/animals/coyote_02.ogg => data/sound/animals/coyote_01.ogg
R   data/sound/animals/crickets1_01.ogg => data/sound/animals/crickets1_00.ogg
R   data/sound/animals/crickets2_01.ogg => data/sound/animals/crickets2_00.ogg
R   data/sound/animals/elk_01.ogg => data/sound/animals/elk_00.ogg
R   data/sound/animals/elk_02.ogg => data/sound/animals/elk_01.ogg
R   data/sound/animals/elk_10.ogg => data/sound/animals/elk_02.ogg
R   data/sound/animals/elk_11.ogg => data/sound/animals/elk_03.ogg
R   data/sound/animals/frog1_00.ogg => data/sound/animals/frog.ogg
R   data/sound/animals/stag_01.ogg => data/sound/animals/stag_00.ogg
R   data/sound/animals/stag_02.ogg => data/sound/animals/stag_01.ogg
R   data/sound/animals/stag_10.ogg => data/sound/animals/stag_02.ogg
R   data/sound/animals/stag_11.ogg => data/sound/animals/stag_03.ogg
R   data/sound/animals/stag_12.ogg => data/sound/animals/stag_04.ogg
R   data/sound/animals/stag_13.ogg => data/sound/animals/stag_05.ogg
R   data/sound/animals/wolf_01.ogg => data/sound/animals/wolf_00.ogg
R   data/sound/animals/wolf_02.ogg => data/sound/animals/wolf_01.ogg
R   data/sound/animals/wolf_03.ogg => data/sound/animals/wolf_02.ogg
R   data/sound/animals/wolf_10.ogg => data/sound/animals/wolf_03.ogg
R   data/sound/animals/wolf_11.ogg => data/sound/animals/wolf_04.ogg
R   data/sound/animals/wolf_12.ogg => data/sound/animals/wolf_05.ogg
R   data/sound/animals/wolf_13.ogg => data/sound/animals/wolf_06.ogg
R   data/sound/animals/wolf_14.ogg => data/sound/animals/wolf_07.ogg
R   data/sound/atlanteans/cutting/stonecutter_01.ogg => data/sound/atlanteans/cutting/stonecutter_00.ogg
R   data/sound/atlanteans/cutting/stonecutter_02.ogg => data/sound/atlanteans/cutting/stonecutter_01.ogg
R   data/sound/atlanteans/cutting/stonecutter_03.ogg => data/sound/atlanteans/cutting/stonecutter_02.ogg
R   data/sound/atlanteans/goldspin_01.ogg => data/sound/atlanteans/goldspin_00.ogg
R   data/sound/atlanteans/goldspin_02.ogg => data/sound/atlanteans/goldspin_01.ogg
R   data/sound/atlanteans/saw/benchsaw_01.ogg => data/sound/atlanteans/saw/benchsaw_00.ogg
R   data/sound/atlanteans/saw/benchsaw_02.ogg => data/sound/atlanteans/saw/benchsaw_01.ogg
R   data/sound/atlanteans/saw/benchsaw_03.ogg => data/sound/atlanteans/saw/benchsaw_02.ogg
R   data/sound/atlanteans/saw/sawing_01.ogg => data/sound/atlanteans/saw/sawing_00.ogg
R   data/sound/atlanteans/saw/sawing_02.ogg => data/sound/atlanteans/saw/sawing_01.ogg
R   data/sound/atlanteans/saw/sawing_03.ogg => data/sound/atlanteans/saw/sawing_02.ogg
R   data/sound/barbarians/blackwood_01.ogg => data/sound/barbarians/blackwood.ogg
R   data/sound/barbarians/mortar_01.ogg => data/sound/barbarians/mortar.ogg
R   data/sound/barbarians/stonegrind_01.ogg => data/sound/barbarians/stonegrind.ogg
R   data/sound/barbarians/taverns/biginn_01.ogg => data/sound/barbarians/taverns/biginn_00.ogg
R   data/sound/barbarians/taverns/biginn_02.ogg => data/sound/barbarians/taverns/biginn_01.ogg
-D  data/sound/barbarians/taverns/biginn_10.ogg
R   data/sound/barbarians/taverns/inn_01.ogg => data/sound/barbarians/taverns/inn_00.ogg
R   data/sound/barbarians/taverns/inn_02.ogg => data/sound/barbarians/taverns/inn_01.ogg
-D  data/sound/barbarians/taverns/inn_10.ogg
R   data/sound/barbarians/taverns/tavern_01.ogg => data/sound/barbarians/taverns/tavern_00.ogg
R   data/sound/barbarians/taverns/tavern_02.ogg => data/sound/barbarians/taverns/tavern_01.ogg
-D  data/sound/barbarians/taverns/tavern_10.ogg
R   data/sound/barbarians/weaver_01.ogg => data/sound/barbarians/weaver.ogg
R   data/sound/click_00.ogg => data/sound/click.ogg
R   data/sound/create_construction_site_00.ogg => data/sound/create_construction_site.ogg
R   data/sound/empire/beerbubble_01.ogg => data/sound/empire/beerbubble_00.ogg
R   data/sound/empire/beerbubble_02.ogg => data/sound/empire/beerbubble_01.ogg
R   data/sound/empire/taverns/meal_01.ogg => data/sound/empire/taverns/meal_00.ogg
R   data/sound/empire/taverns/meal_02.ogg => data/sound/empire/taverns/meal_01.ogg
-D  data/sound/empire/taverns/meal_10.ogg
R   data/sound/empire/taverns/ration_01.ogg => data/sound/empire/taverns/ration_00.ogg
R   data/sound/empire/taverns/ration_02.ogg => data/sound/empire/taverns/ration_01.ogg
-D  data/sound/empire/taverns/ration_10.ogg
R   data/sound/empire/winebubble_01.ogg => data/sound/empire/winebubble_00.ogg
R   data/sound/empire/winebubble_02.ogg => data/sound/empire/winebubble_01.ogg
R   data/sound/farm/donkey_00.ogg => data/sound/farm/donkey.ogg
R   data/sound/farm/sheep_01.ogg => data/sound/farm/sheep_00.ogg
R   data/sound/farm/sheep_02.ogg => data/sound/farm/sheep_01.ogg
R   data/sound/farm/sheep_03.ogg => data/sound/farm/sheep_02.ogg
R   data/sound/fisher/fisher_pull_net_00.ogg => data/sound/fisher/fisher_pull_net.ogg
R   data/sound/fisher/fisher_throw_net_00.ogg => data/sound/fisher/fisher_throw_net.ogg
R   data/sound/hammering/geologist_hammer_00.ogg => data/sound/hammering/geologist_hammer.ogg
R   data/sound/lobby_chat_00.ogg => data/sound/lobby_chat.ogg
R   data/sound/lobby_freshmen_00.ogg => data/sound/lobby_freshmen.ogg
R   data/sound/metal/fizzle_01.ogg => data/sound/metal/fizzle.ogg
R   data/sound/metal/furnace_01.ogg => data/sound/metal/furnace.ogg
R   data/sound/metal/goldping_01.ogg => data/sound/metal/goldping.ogg
R   data/sound/metal/ironping_01.ogg => data/sound/metal/ironping.ogg
R   data/sound/military/site_occupied_00.ogg => data/sound/military/site_occupied.ogg
R   data/sound/military/under_attack_00.ogg => data/sound/military/under_attack.ogg
R   data/sound/mill/weaving_01.ogg => data/sound/mill/weaving.ogg
R   data/sound/smiths/sharpening_00.ogg => data/sound/smiths/sharpening.ogg
-D  data/sound/spoken/
-D  data/sound/spoken/timber_00.ogg
-D  data/sound/spoken/timber_01.ogg
R   data/sound/stonecutting/stonecutter_00.ogg => data/sound/stonecutting/stonecutter.ogg
R   data/sound/stonecutting/stonemason_00.ogg => data/sound/stonecutting/stonemason.ogg
 M  data/sound/wl-sound-docu.csv
R   data/sound/woodcutting/tree-falling_00.ogg => data/sound/woodcutting/tree_falling_00.ogg
R   data/sound/woodcutting/tree-falling_01.ogg => data/sound/woodcutting/tree_falling_01.ogg
-D  data/sound/woodcutting/tree-falling_10.ogg
R   data/sound/woodcutting/woodcutting_00.ogg => data/sound/woodcutting/woodcutting.ogg
 M  data/tribes/atlanteans.lua
 M  data/tribes/barbarians.lua
 M  data/tribes/empire.lua
 M  data/tribes/frisians.lua
 M  data/tribes/immovables/berry_bushes/blueberry/init.lua
 M  data/tribes/immovables/berry_bushes/currant_black/init.lua
 M  data/tribes/immovables/berry_bushes/currant_red/init.lua
 M  data/tribes/immovables/berry_bushes/desert_hackberry/init.lua
 M  data/tribes/immovables/berry_bushes/juniper/init.lua
 M  data/tribes/immovables/berry_bushes/raspberry/init.lua
 M  data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua
 M  data/tribes/immovables/berry_bushes/strawberry/init.lua
 M  data/tribes/ships/atlanteans/init.lua
 M  data/tribes/ships/barbarians/init.lua
 M  data/tribes/ships/empire/init.lua
 M  data/tribes/ships/frisians/init.lua
 M  data/tribes/workers/atlanteans/armorsmith/init.lua
 M  data/tribes/workers/atlanteans/baker/init.lua
 M  data/tribes/workers/atlanteans/blackroot_farmer/init.lua
 M  data/tribes/workers/atlanteans/builder/init.lua
 M  data/tribes/workers/atlanteans/carrier/init.lua
 M  data/tribes/workers/atlanteans/charcoal_burner/init.lua
 M  data/tribes/workers/atlanteans/farmer/init.lua
 M  data/tribes/workers/atlanteans/fishbreeder/init.lua
 M  data/tribes/workers/atlanteans/fisher/init.lua
 M  data/tribes/workers/atlanteans/forester/init.lua
 M  data/tribes/workers/atlanteans/geologist/init.lua
 M  data/tribes/workers/atlanteans/horse/init.lua
 M  data/tribes/workers/atlanteans/horsebreeder/init.lua
 M  data/tribes/workers/atlanteans/hunter/init.lua
 M  data/tribes/workers/atlanteans/miller/init.lua
 M  data/tribes/workers/atlanteans/miner/init.lua
 M  data/tribes/workers/atlanteans/recruit/init.lua
 M  data/tribes/workers/atlanteans/sawyer/init.lua
 M  data/tribes/workers/atlanteans/scout/init.lua
 M  data/tribes/workers/atlanteans/shipwright/init.lua
 M  data/tribes/workers/atlanteans/smelter/init.lua
 M  data/tribes/workers/atlanteans/smoker/init.lua
 M  data/tribes/workers/atlanteans/soldier/init.lua
 M  data/tribes/workers/atlanteans/spiderbreeder/init.lua
 M  data/tribes/workers/atlanteans/stonecutter/init.lua
 M  data/tribes/workers/atlanteans/toolsmith/init.lua
 M  data/tribes/workers/atlanteans/trainer/init.lua
 M  data/tribes/workers/atlanteans/weaponsmith/init.lua
 M  data/tribes/workers/atlanteans/weaver/init.lua
 M  data/tribes/workers/atlanteans/woodcutter/init.lua
 M  data/tribes/workers/barbarians/baker/init.lua
 M  data/tribes/workers/barbarians/blacksmith/init.lua
 M  data/tribes/workers/barbarians/blacksmith_master/init.lua
 M  data/tribes/workers/barbarians/brewer/init.lua
 M  data/tribes/workers/barbarians/brewer_master/init.lua
 M  data/tribes/workers/barbarians/builder/init.lua
 M  data/tribes/workers/barbarians/carrier/init.lua
 M  data/tribes/workers/barbarians/cattlebreeder/init.lua
 M  data/tribes/workers/barbarians/charcoal_burner/init.lua
 M  data/tribes/workers/barbarians/farmer/init.lua
 M  data/tribes/workers/barbarians/fisher/init.lua
 M  data/tribes/workers/barbarians/gamekeeper/init.lua
 M  data/tribes/workers/barbarians/gardener/init.lua
 M  data/tribes/workers/barbarians/geologist/init.lua
 M  data/tribes/workers/barbarians/helmsmith/init.lua
 M  data/tribes/workers/barbarians/hunter/init.lua
 M  data/tribes/workers/barbarians/innkeeper/init.lua
 M  data/tribes/workers/barbarians/lime_burner/init.lua
 M  data/tribes/workers/barbarians/lumberjack/init.lua
 M  data/tribes/workers/barbarians/miner/init.lua
 M  data/tribes/workers/barbarians/miner_chief/init.lua
 M  data/tribes/workers/barbarians/miner_master/init.lua
 M  data/tribes/workers/barbarians/ox/init.lua
 M  data/tribes/workers/barbarians/ranger/init.lua
 M  data/tribes/workers/barbarians/recruit/init.lua
 M  data/tribes/workers/barbarians/scout/init.lua
 M  data/tribes/workers/barbarians/shipwright/init.lua
 M  data/tribes/workers/barbarians/smelter/init.lua
 M  data/tribes/workers/barbarians/soldier/init.lua
 M  data/tribes/workers/barbarians/stonemason/init.lua
 M  data/tribes/workers/barbarians/trainer/init.lua
 M  data/tribes/workers/barbarians/weaver/init.lua
 M  data/tribes/workers/empire/armorsmith/init.lua
 M  data/tribes/workers/empire/baker/init.lua
 M  data/tribes/workers/empire/brewer/init.lua
 M  data/tribes/workers/empire/builder/init.lua
 M  data/tribes/workers/empire/carpenter/init.lua
 M  data/tribes/workers/empire/carrier/init.lua
 M  data/tribes/workers/empire/charcoal_burner/init.lua
 M  data/tribes/workers/empire/donkey/init.lua
 M  data/tribes/workers/empire/donkeybreeder/init.lua
 M  data/tribes/workers/empire/farmer/init.lua
 M  data/tribes/workers/empire/fisher/init.lua
 M  data/tribes/workers/empire/forester/init.lua
 M  data/tribes/workers/empire/geologist/init.lua
 M  data/tribes/workers/empire/hunter/init.lua
 M  data/tribes/workers/empire/innkeeper/init.lua
 M  data/tribes/workers/empire/lumberjack/init.lua
 M  data/tribes/workers/empire/miller/init.lua
 M  data/tribes/workers/empire/miner/init.lua
 M  data/tribes/workers/empire/miner_master/init.lua
 M  data/tribes/workers/empire/pigbreeder/init.lua
 M  data/tribes/workers/empire/recruit/init.lua
 M  data/tribes/workers/empire/scout/init.lua
 M  data/tribes/workers/empire/shepherd/init.lua
 M  data/tribes/workers/empire/shipwright/init.lua
 M  data/tribes/workers/empire/smelter/init.lua
 M  data/tribes/workers/empire/soldier/init.lua
 M  data/tribes/workers/empire/stonemason/init.lua
 M  data/tribes/workers/empire/toolsmith/init.lua
 M  data/tribes/workers/empire/trainer/init.lua
 M  data/tribes/workers/empire/vinefarmer/init.lua
 M  data/tribes/workers/empire/vintner/init.lua
 M  data/tribes/workers/empire/weaponsmith/init.lua
 M  data/tribes/workers/empire/weaver/init.lua
 M  data/tribes/workers/frisians/baker/init.lua
 M  data/tribes/workers/frisians/baker_master/init.lua
 M  data/tribes/workers/frisians/beekeeper/init.lua
 M  data/tribes/workers/frisians/berry_farmer/init.lua
 M  data/tribes/workers/frisians/blacksmith/init.lua
 M  data/tribes/workers/frisians/blacksmith_master/init.lua
 M  data/tribes/workers/frisians/brewer/init.lua
 M  data/tribes/workers/frisians/brewer_master/init.lua
 M  data/tribes/workers/frisians/brickmaker/init.lua
 M  data/tribes/workers/frisians/builder/init.lua
 M  data/tribes/workers/frisians/carrier/init.lua
 M  data/tribes/workers/frisians/charcoal_burner/init.lua
 M  data/tribes/workers/frisians/claydigger/init.lua
 M  data/tribes/workers/frisians/farmer/init.lua
 M  data/tribes/workers/frisians/fisher/init.lua
 M  data/tribes/workers/frisians/forester/init.lua
 M  data/tribes/workers/frisians/fruit_collector/init.lua
 M  data/tribes/workers/frisians/geologist/init.lua
 M  data/tribes/workers/frisians/hunter/init.lua
 M  data/tribes/workers/frisians/landlady/init.lua
 M  data/tribes/workers/frisians/miner/init.lua
 M  data/tribes/workers/frisians/miner_master/init.lua
 M  data/tribes/workers/frisians/reed_farmer/init.lua
 M  data/tribes/workers/frisians/reindeer/init.lua
 M  data/tribes/workers/frisians/reindeer_breeder/init.lua
 M  data/tribes/workers/frisians/scout/init.lua
 M  data/tribes/workers/frisians/seamstress/init.lua
 M  data/tribes/workers/frisians/seamstress_master/init.lua
 M  data/tribes/workers/frisians/shipwright/init.lua
 M  data/tribes/workers/frisians/smelter/init.lua
 M  data/tribes/workers/frisians/smoker/init.lua
 M  data/tribes/workers/frisians/soldier/init.lua
 M  data/tribes/workers/frisians/stonemason/init.lua
 M  data/tribes/workers/frisians/trainer/init.lua
 M  data/tribes/workers/frisians/woodcutter/init.lua
 M  data/world/critters/badger/init.lua
 M  data/world/critters/brownbear/init.lua
 M  data/world/critters/bunny/init.lua
 M  data/world/critters/chamois/init.lua
 M  data/world/critters/deer/init.lua
 M  data/world/critters/duck/init.lua
 M  data/world/critters/elk/init.lua
 M  data/world/critters/fox/init.lua
 M  data/world/critters/lynx/init.lua
 M  data/world/critters/marten/init.lua
 M  data/world/critters/reindeer/init.lua
 M  data/world/critters/sheep/init.lua
 M  data/world/critters/stag/init.lua
 M  data/world/critters/wildboar/init.lua
 M  data/world/critters/wisent/init.lua
 M  data/world/critters/wolf/init.lua
 M  data/world/immovables/grass1/init.lua
 M  data/world/immovables/grass2/init.lua
 M  data/world/immovables/grass3/init.lua
 M  doc/sphinx/source/animations.rst
 M  src/CMakeLists.txt
 M  src/game_io/game_loader.cc
 M  src/graphic/animation.cc
 M  src/graphic/animation.h
 M  src/helper.h
 M  src/io/filesystem/disk_filesystem.cc
 M  src/io/filesystem/disk_filesystem.h
 M  src/io/filesystem/filesystem.cc
 M  src/io/filesystem/filesystem.h
 M  src/io/filesystem/layered_filesystem.cc
 M  src/io/filesystem/layered_filesystem.h
 M  src/io/filesystem/zip_filesystem.cc
 M  src/io/filesystem/zip_filesystem.h
 M  src/logic/map_objects/map_object.cc
 M  src/logic/map_objects/map_object.h
 M  src/logic/map_objects/tribes/ship.cc
 M  src/logic/map_objects/tribes/tribe_descr.cc
 M  src/logic/map_objects/tribes/worker_descr.cc
 M  src/logic/map_objects/world/critter.cc
 M  src/map_io/CMakeLists.txt
 M  src/map_io/map_scripting_packet.cc
 M  src/scripting/lua_path.cc
 M  src/sound/fxset.cc
 M  src/sound/fxset.h
 M  src/sound/songset.cc
 M  src/sound/sound_handler.cc
 M  src/sound/sound_handler.h
 M  src/wlapplication.cc
 M  src/wui/load_or_save_game.cc
Text conflict in src/CMakeLists.txt
Text conflict in src/wlapplication.cc
2 conflicts encountered.


-- 
https://code.launchpad.net/~widelands-dev/widelands/list-directories-in-cpp/+merge/366614
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/list-directories-in-cpp.
References

[Merge] lp:~widelands-dev/widelands/list-directories-in-cpp into lp:widelands
From: GunChleoc, 2019-04-28