From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sun, 15 Jul 2007 07:57:30 +0000 (+0000)
Subject: The svnmerge-integrated property for /branches/packaging suggests
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95ef3728beb2705ac6c65b6fa37fe8ffd360fd9d;p=scons.git

The svnmerge-integrated property for /branches/packaging suggests
that revisions up to 1594 have already been merged to the trunk,
but most of the files added on the branch (everything under examples/,
src/engine/SCons/Tool/Packaging, test/packaging) don't actually appear on
the trunk.  Since I don't think we've ever actually merged, the 1594 rev
probably dates from when we started using svnmerge and probably reflects
incorrect initialization.

This sets the property back to revision 1501 (when the branch was cut)
in an attempt to get svnmerge to apply all the changes cleanly.  If
it's necessary, we can restore it to 1594...


git-svn-id: http://scons.tigris.org/svn/scons/trunk@2138 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---