Go to file
rjtanner de1d2e1738 Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452).
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@16242 282e977c-c81d-0410-88c4-b93c2d0d6712
2011-12-21 05:02:57 +00:00
Info
animations/maps/navar_city
azumauindo Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
brest Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
darcap Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
dragonisland
dungeons
editor
euthville Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
inn_and_outpost
lake_country Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
marksel
mlab Spelling corrections (ofcourse -> of course, buisness -> business) to Cloud World de City (mlab/citydeclouds/cloudworlddecity). 2011-12-14 00:12:58 +00:00
navar_city Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
planes
port_joseph Update and layout changes to The Drunken Shark of Port Joseph. Expanded the map to include ground outside the tavern walls. Door or entrance now opens when a player approaches. Map considered an outdoor map so darkness or time of day is visible when inside; added light sources. Updated world map for new map entrance destination. 2011-11-30 06:36:32 +00:00
pup_land Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
python Fix probably broken crystal room price (12 jade instead of 2 platinum). 2011-12-01 22:21:11 +00:00
quests
santo_dominion Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
scorn Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
sisters
start Remove unnecessary name_pl reference to Hall Of Selection, Wraith. 2011-11-13 05:16:07 +00:00
styles
teamarena
templates Remove extra spacing to object name (ruby converter -> ruby converter) in guild template map, mainfloor. 2011-12-21 04:51:16 +00:00
test
under_world
unlinked
whalingoutpost Remove unnecessary name_pl references to Underwater Dungeon Level 1 in Whaling Outpost. 2011-11-16 04:56:35 +00:00
wolfsburg Merge in template changes to guild maps which include updated last modified date, object name correction (r16241), new converters archetypes (r16115), floor tile corrections (r16112) and renamed river archetypes (r15452). 2011-12-21 05:02:57 +00:00
world Update and layout changes to The Drunken Shark of Port Joseph. Expanded the map to include ground outside the tavern walls. Door or entrance now opens when a player approaches. Map considered an outdoor map so darkness or time of day is visible when inside; added light sources. Updated world map for new map entrance destination. 2011-11-30 06:36:32 +00:00
.emergency
COPYING
ChangeLog Updated ChangeLog generated using svn2cl 2011-11-23 05:55:25 +00:00
HallOfDMs
HallOfSelection
README
regions.reg
world.quests

README

==============================================================================
ChangeLog
==============================================================================

The ChangeLog file has been built with svn2cl 0.7 and 0.9 as obtained fromm
http://ch.tudelft.nl/~arthur/svn2cl/downloads.html.  Do not use version 0.6
or older as it appears to generate incompatible ChangeLog formats.

These instructions presume an installation of the tarball similar to this.
The actual paths may be different for each developer, but these are used for
sake of example.  There is no requirement to use the example paths.

  $ cd ~
  $ tar -xzf svn2cl-0.9.tar.gz

To update the ChangeLog, a command sequence like this is generally possible
with one caveat.  Do not check in the results without checking the the changes
with svn diff to avoid throwing away someone's comments that are more verbose
than the svn commit comment.

  $ cd /home/data/svn/crossfire/maps/trunk
  $ ~/svn2cl-0.9/svn2cl.sh

The following may be safer, but also may not entirely regenerate missing
entries if manual edits have been made.  Again, never check in updates without
checking differences and merging any manual edits developers may have made.

1) Only generate portion of the ChangeLog since the last svn2cl run.

   Determine the date of the last svn2cl run by looking at the top of the
   ChangeLog.  For this example, presume 2007-12-20 is the last svn2cl
   notation, and that today is 2007-12-30.

   $ cd /home/data/svn/crossfire/maps/trunk
   $ ~/svn2cl-0.9/svn2cl.sh -o ChangeLog.New -r "{2007-12-30}:{2007-12-20}"

   Note that the day of the last svn2cl is used in case new entries were made
   that day following the svn2cl run.

   Place the contents of ChangeLog.New at the top of the ChangeLog file, but
   make sure to delete any redundant entries.  If manual entries have been
   made, merge any additional content with the appropriate svn2cl generated
   entries.

2) Regenerate the entire log, but generate a patch file.

  $ cd /home/data/svn/crossfire/maps/trunk
  $ ~/svn2cl-0.9/svn2cl.sh --output=ChangeLog.New
  $ diff -u ChangeLog ChangeLog.New >ChangeLog.patch

  Verify the ChangeLog.patch file and remove any patch hunks that would remove
  information prior to patching up the ChangeLog file for commit.