[racket-dev] ready for the package switch?

I'm rebasing my generic-sets branch onto the pkg2 branch to make sure that
rebasing works well.  Just using the default rebase options hasn't worked,
it doesn't figure out to follow the renames.  The following command seems
to be working, however; it may work for other people as well:

  git rebase -s recursive -X rename-threshold=50% mflatt/pkg2

This tells git that any files that are at least 50% similar (I guess by
line count?) are considered renamed versions of each other, and I guess
gives it permission to do the necessary, somewhat expensive search to
figure out which files to change in the rebased version instead of the ones
you actually changed in the original.  I also had to run the following
command first:

  git config merge.renameLimit 100000

Otherwise git won't use the rename-threshold, because there are too many
files to consider in our repository and it doesn't believe you really want
it to do _that much_ work.  You can revert this afterward with:

  git config --unset merge.renameLimit

<rant>I don't understand why version control systems don't take directories
and renames more seriously, because this stuff is part of the development
cycle and should be recorded like any other change.</rant>

Anyway, if any of you out there are having trouble rebasing onto Matthew's
packages branch, try the commands above.

Carl Eastlund

On Tue, Jun 18, 2013 at 12:47 PM, Matthew Flatt <mflatt at cs.utah.edu> wrote:

> Here's the latest (in a "pkg2" branch):
>
>  https://github.com/mflatt/racket/tree/pkg2
>
> Because this change will break all sorts of things in the short run,
> I'd like to feel more confident that enough of us are ready before
> merging it to the main Racket repository.
>
> So, vote in favor of the reorganization like this:
>
>  1. Try the branch:
>
>       git clone https://github.com/mflatt/racket.git
>       cd racket
>       git checkout pkg2
>       make
>       racket/bin/drracket
>
>  2. Reply to the list to say that it works and we should merge it.
>
>  3. If you have code in "pkgs", be ready to help get that code into the
>     right shape/packages after the merge.
>
> Thanks!
>
>
> (We haven't yet changed anything about single-collection versus
> multi-collection packages. That's currently planned for right after the
> merge.)
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.racket-lang.org/dev/archive/attachments/20130618/52a37aa9/attachment.html>