Go to file
kts of kettek a84fdb6ecd Merge remote-tracking branch 'upstream/master' 2024-04-11 11:48:09 -07:00
Info Add region-digraphs tool to generate GraphViz region layout files. 2023-04-10 21:53:03 -04:00
animations/maps/navar_city Remove trailing whitespace. 2013-05-09 11:08:11 +00:00
azumauindo Minor punctuation updates to NPC dialogue in Minatomachi Ichidou Dzuki Ruggilli, Entrance 2023-11-23 01:27:32 -06:00
brest Replace empty book with random_reading book in Castle of Brittany, Acid Chamber 2023-12-18 00:30:20 -06:00
darcap Deadname removal. 2024-02-26 08:08:43 -05:00
dragonisland Add new dragon hangars 2024-03-16 18:04:57 -07:00
dungeons Wording correction (strangly -> strongly) to NPC dialogue in Liomal's house, ground floor 2023-11-21 14:16:02 -06:00
editor Merge remote-tracking branch 'upstream/master' 2024-04-11 11:48:09 -07:00
euthville Allow the priest of Valriel to give more keys, in case the player gets killed and the church reset meanwhile 2024-02-25 11:51:52 +01:00
inn_and_outpost Minor wording update to NPC dialogue in Sweets Inn 2023-12-01 00:13:44 -06:00
lake_country Add new dragon hangars 2024-03-16 18:04:57 -07:00
marksel Minor grammar updates to NPC dilaogue in Sages' Tower 2023-11-27 00:27:50 -06:00
mlab Add missing shop mat 2024-03-22 17:34:32 -07:00
navar_city Merge remote-tracking branch 'upstream/master' 2024-04-11 11:48:09 -07:00
planes Adjust big chest region 2024-03-22 17:05:39 -07:00
port_joseph Punctuation updates to NPC dialogue in Underground Tavern 2023-12-04 01:10:39 -06:00
pup_land Fix wall blocking exit 2024-03-22 16:49:51 -07:00
python Fix guild definitions 2024-03-31 11:32:51 -07:00
quests Merge remote-tracking branch 'upstream/master' 2024-04-11 11:48:09 -07:00
santo_dominion Deadname removal. 2024-02-26 08:08:43 -05:00
scorn Remove extraneously copied files 2024-03-31 11:34:07 -07:00
sisters Minor grammar and wording updates to NPC dialogue in Three Sisters Tower 2023-12-03 01:09:32 -06:00
start Minor punctuation update to NPC dialogue in Tutorial 1 2023-12-04 01:00:58 -06:00
styles Deadname removal. 2024-02-26 08:08:43 -05:00
teamarena Correct spacing after punctuation in msg text for maps in the teamarena/ diretory 2023-06-14 17:05:55 -05:00
templates Fix guild definitions 2024-03-31 11:32:51 -07:00
test Deadname removal. 2024-02-26 08:08:43 -05:00
under_world Correct spacing after punctuation in msg text for maps in the under_world/ diretory 2023-06-14 17:34:28 -05:00
unlinked Remove uses of absurdly high glow_radius 2023-02-16 22:49:04 -08:00
whalingoutpost Minor grammar and punctuation update to NPC dialogue in Storehouse (whalingoutpost/taverns/storehouse1) 2023-11-29 17:26:35 -06:00
wolfsburg Deadname removal. 2024-02-26 08:08:43 -05:00
world Merge remote-tracking branch 'upstream/master' 2024-04-11 11:48:09 -07:00
.emergency scorn/scorn: Removed, city is world map - keeping that one around will 2002-06-15 07:51:10 +00:00
.gitignore Ignore Python compiled files 2022-05-15 13:12:56 +02:00
COPYING add license to maps directory. 2006-06-29 06:24:07 +00:00
ChangeLog Deadname removal. 2024-02-26 08:08:43 -05:00
HallOfDMs Correct spacing after punctuation in msg text 2023-06-04 01:07:45 -05:00
HallOfSelection Correct spacing after punctuation in msg text, removed forced line breaks 2023-06-04 01:06:52 -05:00
README - Change the order of the dates when using -r with svn2cl so that the log 2007-12-30 05:37:41 +00:00
regions.reg Remove dot for coherency with other long names 2022-05-22 13:07:46 +02:00
world.bells Add city bells definition file. 2021-04-20 17:53:01 +00:00
world.citylife Try to somewhat merge the citylife definitions for Scorn and Scorn County on /world/world_105_116. 2023-04-18 11:23:21 -04:00
world.quests Remove obsolete 'include' from quests, update the root file to contain the syntax 2021-11-07 19:38:11 +01:00

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.