[darcs-users] darcs patch: conflict resolution for unstable + make branch.

[Trent W. Buck]

This merges my make branch with the current unstable (as at this
morning).  In particular, the last patch makes the new profiling
targets much sexier... but I'm having trouble testing it, due to
exciting failures like "Impossible!  Not enough registers!"

I'd appreciate if someone (Ganesh?) could confirm that this bundle
doesn't cause regressions in the profiling targets.

Thu Oct 23 14:01:39 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  [Stuff you've seen before.]

Tue Nov  4 23:33:59 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Resolve conflicts.

Tue Nov  4 23:41:16 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Move cleanup rules to appropriate target (clean/distclean).

Tue Nov  4 23:42:08 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Delete obsolete test_network target.

  As far as I can determine, this rule is effectively identical to
  test-darcs-2, as the only difference is that it doesn't specify
  repository format and darcs-2 is the default.

Tue Nov  4 23:45:30 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Delete unused "register" target.

Tue Nov  4 23:57:51 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Ameliorative ChangeLog mode hint for Emacs.

  This patch makes Emacs use outline (hierarchical) mode, and to
  recognize "darcs (N)" as a first-level heading and " * foo" as a
  third-level heading.  Treating the latter correctly, as second-level
  headings, is beyond my capabilities.

  I'd prefer that this file be moved to "NEWS" and formatted as outline-
  mode expects: each Nth-level heading starts with N stars and a space.

Wed Nov  5 00:03:38 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * autoconf.mk doesn't depend on darcs.cgi.in.

  The old version was saying things "autoconf.mk depends on
  darcs.cgi.in", which isn't quite right.  The replacement is shorter
  and more correct.

Wed Nov  5 00:28:34 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Refactor TAGS targets.

  Renamed targets to match default output files, obviating PHONY.
  Removed the ugly manual sorting, as exuberant ctags sorts by default.
  Moved cleanup into distclean.
  Added C inputs to dependency list.
  Avoid abusing $ETAGS and $CTAGS for hasktags.

Wed Nov  5 10:56:41 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Typo: make distclean and maintainer-clean rules cumulative.

Wed Nov  5 12:45:27 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Resolve conflicts.

  Mostly conflicts were between Trent's make refactoring and Kowey's
  copy-and-paste job to add support for building profiled object files
  and executables in parallel to the non-profiled build.

Wed Nov  5 16:22:35 EST 2008  Trent W. Buck <trentbuck at gmail.com>
  * Refactor away boilerplate in naughty ./configure-circumventing profile targets.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-darcs-patch
Size: 237370 bytes
Desc: A darcs patch for your repository!
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20081104/4dbfc4a1/attachment-0001.bin