This page is no longer maintained — Please continue to the home page at www.scala-lang.org

Scala Github repository is now live

26 replies
Joshua.Suereth
Joined: 2008-09-02,
User offline. Last seen 32 weeks 5 days ago.
Hello Scala Community,

I'm happy to inform you that the *new and clean* Scala git repository is now live and official.  Over the next few days, we'll be migrating the rest of the ecosystem over to this repository.
But for now, feel free to clone and test things out!
https://github.com/scala/scala

- Josh
P.S. If you have old forks, you may want to rename them and git remote set-url <old-scala-remote> git://github.com/scala/legacy-svn-scala.git
Simon Ochsenreither
Joined: 2011-07-17,
User offline. Last seen 42 years 45 weeks ago.
Re: Scala Github repository is now live
Will the old pull requests still be honored?

Those three are so trivial that I would prefer to avoid re-doing them _again_:

Moved example files from the standard library to docs/examples.
No reason we need to ship with three pictures of flowers and one banana in the std lib. Fixes SI-4627.
This reduces the size of scala-swing.jar by ~180kb.
https://github.com/scala/legacy-svn-scala/pull/71

Makes Range#sum an O(1) operation instead of an O(n) one.
Partially fixes SI-4658. NumericRange stays slow, thanks to the one who had the brilliant idea that Numeric doesn't need a division operation.
https://github.com/scala/legacy-svn-scala/pull/83

Fixes the annoying spaces between name, type params and params in ScalaDoc
https://github.com/scala/legacy-svn-scala/pull/109

daniel
Joined: 2008-08-20,
User offline. Last seen 44 weeks 14 hours ago.
Re: Re: Scala Github repository is now live
Note that it should be easy enough to adjust these pull requests so that they work on top of the new repository.  Basically, you need to do the following.  First, fix up the remote for the old scala repository so that it points to legacy-svn-scala (the easiest way to do this is to just edit .git/config).  Second, add a new remote for the new scala/scala repository.  Fetch from that remote (do not pull).  Now, make sure that each of your pull requests are in separate branches (they really should be anyway).  Checkout those branches, then rebase them on top of the corresponding commits in the scala/master remote (where "scala" is assumed to be the remote name of the new scala/scala repository).  This rebase should happen cleanly.  Note that you may want to do rebase -i just to make sure that it doesn't pull in any redundant commits, but this shouldn't be necessary.  Once each of your commits is rebased, you can just `git remote rm` the legacy-svn remote and work exclusively with scala/scala.  No commit redoing required!

Daniel

On Wed, Nov 30, 2011 at 2:47 PM, Simon Ochsenreither <simon [dot] ochsenreither [at] googlemail [dot] com> wrote:
Will the old pull requests still be honored?

Those three are so trivial that I would prefer to avoid re-doing them _again_:

Moved example files from the standard library to docs/examples.
No reason we need to ship with three pictures of flowers and one banana in the std lib. Fixes SI-4627.
This reduces the size of scala-swing.jar by ~180kb.
https://github.com/scala/legacy-svn-scala/pull/71

Makes Range#sum an O(1) operation instead of an O(n) one.
Partially fixes SI-4658. NumericRange stays slow, thanks to the one who had the brilliant idea that Numeric doesn't need a division operation.
https://github.com/scala/legacy-svn-scala/pull/83

Fixes the annoying spaces between name, type params and params in ScalaDoc
https://github.com/scala/legacy-svn-scala/pull/109


Simon Ochsenreither
Joined: 2011-07-17,
User offline. Last seen 42 years 45 weeks ago.
Re: Scala Github repository is now live
Will the old pull requests still be honored?

Those three are so trivial that I would prefer to avoid re-doing them _again_:

Moved example files from the standard library to docs/examples.
No reason we need to ship with three pictures of flowers and one banana in the std lib. Fixes SI-4627.
This reduces the size of scala-swing.jar by ~180kb.
https://github.com/scala/legacy-svn-scala/pull/71

Makes Range#sum an O(1) operation instead of an O(n) one.
Partially fixes SI-4658. NumericRange stays slow, thanks to the one who had the brilliant idea that Numeric doesn't need a division operation.
https://github.com/scala/legacy-svn-scala/pull/83

Fixes the annoying spaces between name, type params and params in ScalaDoc
https://github.com/scala/legacy-svn-scala/pull/109

Dean Wampler
Joined: 2008-12-26,
User offline. Last seen 42 years 45 weeks ago.
Re: Scala Github repository is now live

Nice work, all! Now we can say that Scala is cool ;)

On Wed, Nov 30, 2011 at 1:17 PM, Josh Suereth wrote:
> Hello Scala Community,
>
> I'm happy to inform you that the *new and clean* Scala git repository is now
> live and official.  Over the next few days, we'll be migrating the rest of
> the ecosystem over to this repository.
> But for now, feel free to clone and test things out!
> https://github.com/scala/scala
>
> - Josh
> P.S. If you have old forks, you may want to rename them and git remote
> set-url  git://github.com/scala/legacy-svn-scala.git

Dean Wampler
Joined: 2008-12-26,
User offline. Last seen 42 years 45 weeks ago.
Re: Scala Github repository is now live

Nice work, all! Now we can say that Scala is cool ;)

On Wed, Nov 30, 2011 at 1:17 PM, Josh Suereth wrote:
> Hello Scala Community,
>
> I'm happy to inform you that the *new and clean* Scala git repository is now
> live and official.  Over the next few days, we'll be migrating the rest of
> the ecosystem over to this repository.
> But for now, feel free to clone and test things out!
> https://github.com/scala/scala
>
> - Josh
> P.S. If you have old forks, you may want to rename them and git remote
> set-url  git://github.com/scala/legacy-svn-scala.git

Dean Wampler
Joined: 2008-12-26,
User offline. Last seen 42 years 45 weeks ago.
Re: Scala Github repository is now live

Nice work, all! Now we can say that Scala is cool ;)

On Wed, Nov 30, 2011 at 1:17 PM, Josh Suereth wrote:
> Hello Scala Community,
>
> I'm happy to inform you that the *new and clean* Scala git repository is now
> live and official.  Over the next few days, we'll be migrating the rest of
> the ecosystem over to this repository.
> But for now, feel free to clone and test things out!
> https://github.com/scala/scala
>
> - Josh
> P.S. If you have old forks, you may want to rename them and git remote
> set-url  git://github.com/scala/legacy-svn-scala.git

Joshua.Suereth
Joined: 2008-09-02,
User offline. Last seen 32 weeks 5 days ago.
Re: Re: Scala Github repository is now live
As long as this method does *not* pull in any jar files, or removed tests. that's perfectly acceptable.
The rest of the odd pull requests, as stated in an earlier email, you should privately email me if you need help migrating them to the new repo.  We don't want to loose anyone's contributions.   However, depending on which areas of Scala the contributions affects will determine the speed at which we can merge.
For example, for those who listened to the scala types podcast with Paul Phillips, you know that the compiler itself is rather complex and requires a lot of validation of patches, whereas areas of the standard library, or more importantly *passing tests* are much easier to pull in.
I've spent quite a bit of time adapting patches from repositories over the past weeks, so I should be able to help anyone who needs it.  We don't want to loose any contributions.
- Josh

On Wed, Nov 30, 2011 at 3:57 PM, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:
Note that it should be easy enough to adjust these pull requests so that they work on top of the new repository.  Basically, you need to do the following.  First, fix up the remote for the old scala repository so that it points to legacy-svn-scala (the easiest way to do this is to just edit .git/config).  Second, add a new remote for the new scala/scala repository.  Fetch from that remote (do not pull).  Now, make sure that each of your pull requests are in separate branches (they really should be anyway).  Checkout those branches, then rebase them on top of the corresponding commits in the scala/master remote (where "scala" is assumed to be the remote name of the new scala/scala repository).  This rebase should happen cleanly.  Note that you may want to do rebase -i just to make sure that it doesn't pull in any redundant commits, but this shouldn't be necessary.  Once each of your commits is rebased, you can just `git remote rm` the legacy-svn remote and work exclusively with scala/scala.  No commit redoing required!

Daniel

On Wed, Nov 30, 2011 at 2:47 PM, Simon Ochsenreither <simon [dot] ochsenreither [at] googlemail [dot] com> wrote:
Will the old pull requests still be honored?

Those three are so trivial that I would prefer to avoid re-doing them _again_:

Moved example files from the standard library to docs/examples.
No reason we need to ship with three pictures of flowers and one banana in the std lib. Fixes SI-4627.
This reduces the size of scala-swing.jar by ~180kb.
https://github.com/scala/legacy-svn-scala/pull/71

Makes Range#sum an O(1) operation instead of an O(n) one.
Partially fixes SI-4658. NumericRange stays slow, thanks to the one who had the brilliant idea that Numeric doesn't need a division operation.
https://github.com/scala/legacy-svn-scala/pull/83

Fixes the annoying spaces between name, type params and params in ScalaDoc
https://github.com/scala/legacy-svn-scala/pull/109



daniel
Joined: 2008-08-20,
User offline. Last seen 44 weeks 14 hours ago.
Re: Re: Scala Github repository is now live

As long as this method does *not* pull in any jar files, or removed tests. that's perfectly acceptable.

Your signal that it's pulling something in that it shouldn't would be if the rebase fails to apply cleanly (or if you had actually added a JAR in the commit itself).  The latter seems unlikely, while the former is a giant, slap-you-in-the-face indication that something has gone wrong.

Daniel
Joshua.Suereth
Joined: 2008-09-02,
User offline. Last seen 32 weeks 5 days ago.
Re: Re: Scala Github repository is now live
If you manage to accomplish the latter, there's a script for that.   However, again, warn me so we can get the JAR published properly.
- Josh

On Wed, Nov 30, 2011 at 4:43 PM, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:

As long as this method does *not* pull in any jar files, or removed tests. that's perfectly acceptable.

Your signal that it's pulling something in that it shouldn't would be if the rebase fails to apply cleanly (or if you had actually added a JAR in the commit itself).  The latter seems unlikely, while the former is a giant, slap-you-in-the-face indication that something has gone wrong.

Daniel

Simon Ochsenreither
Joined: 2011-07-17,
User offline. Last seen 42 years 45 weeks ago.
Re: Re: Scala Github repository is now live
Sorry, I'm not that good with Git ... Actually, I want to throw away my old Git repo and clone a fresh one after the stuff is pulled, so I don't want to invest more time than necessary.

Joshua.Suereth
Joined: 2008-09-02,
User offline. Last seen 32 weeks 5 days ago.
Re: Scala Github repository is now live
Well, we expected to find at least one issue, and we did.
The pull/push binary libs scripts had a last minute fix for windows that unfortunately broke macintosh (due to uname differences between GNU coretools and POSIX).
The *only* change was a single line in the tools/binary-repo-libs.sh script, but this has generated new SHA's for all commits in the repository, so it mandated a re-fork.   We've verified that everything works on cygwin, linux and macintosh.   Please download and try it out.
I apologize to everyone for the necessity, but forks made today will have to be remade against the current scala/scala because the commit history has been altered.   
Note:  This is the *LAST* time history in git will be rewritten for Scala.   Each head (2.8.x, 2.9.x and master) is up-to-date and working, and we'll use regular old patches to move forward from this point.
Again, I apologize for any inconvenience.   We thank everyone for the pull requests so far, and we look forward to many more in the future!
- Josh


On Wed, Nov 30, 2011 at 2:17 PM, Josh Suereth <joshua [dot] suereth [at] gmail [dot] com> wrote:
Hello Scala Community,

I'm happy to inform you that the *new and clean* Scala git repository is now live and official.  Over the next few days, we'll be migrating the rest of the ecosystem over to this repository. ed oBut for now, feel free to clone and test things out!
https://github.com/scala/scala

- Josh
P.S. If you have old forks, you may want to rename them and git remote set-url <old-scala-remote> git://github.com/scala/legacy-svn-scala.git

Joshua.Suereth
Joined: 2008-09-02,
User offline. Last seen 32 weeks 5 days ago.
Re: Scala Github repository is now live
Well, we expected to find at least one issue, and we did.
The pull/push binary libs scripts had a last minute fix for windows that unfortunately broke macintosh (due to uname differences between GNU coretools and POSIX).
The *only* change was a single line in the tools/binary-repo-libs.sh script, but this has generated new SHA's for all commits in the repository, so it mandated a re-fork.   We've verified that everything works on cygwin, linux and macintosh.   Please download and try it out.
I apologize to everyone for the necessity, but forks made today will have to be remade against the current scala/scala because the commit history has been altered.   
Note:  This is the *LAST* time history in git will be rewritten for Scala.   Each head (2.8.x, 2.9.x and master) is up-to-date and working, and we'll use regular old patches to move forward from this point.
Again, I apologize for any inconvenience.   We thank everyone for the pull requests so far, and we look forward to many more in the future!
- Josh


On Wed, Nov 30, 2011 at 2:17 PM, Josh Suereth <joshua [dot] suereth [at] gmail [dot] com> wrote:
Hello Scala Community,

I'm happy to inform you that the *new and clean* Scala git repository is now live and official.  Over the next few days, we'll be migrating the rest of the ecosystem over to this repository. ed oBut for now, feel free to clone and test things out!
https://github.com/scala/scala

- Josh
P.S. If you have old forks, you may want to rename them and git remote set-url <old-scala-remote> git://github.com/scala/legacy-svn-scala.git

Joshua.Suereth
Joined: 2008-09-02,
User offline. Last seen 32 weeks 5 days ago.
Re: Scala Github repository is now live
Well, we expected to find at least one issue, and we did.
The pull/push binary libs scripts had a last minute fix for windows that unfortunately broke macintosh (due to uname differences between GNU coretools and POSIX).
The *only* change was a single line in the tools/binary-repo-libs.sh script, but this has generated new SHA's for all commits in the repository, so it mandated a re-fork.   We've verified that everything works on cygwin, linux and macintosh.   Please download and try it out.
I apologize to everyone for the necessity, but forks made today will have to be remade against the current scala/scala because the commit history has been altered.   
Note:  This is the *LAST* time history in git will be rewritten for Scala.   Each head (2.8.x, 2.9.x and master) is up-to-date and working, and we'll use regular old patches to move forward from this point.
Again, I apologize for any inconvenience.   We thank everyone for the pull requests so far, and we look forward to many more in the future!
- Josh


On Wed, Nov 30, 2011 at 2:17 PM, Josh Suereth <joshua [dot] suereth [at] gmail [dot] com> wrote:
Hello Scala Community,

I'm happy to inform you that the *new and clean* Scala git repository is now live and official.  Over the next few days, we'll be migrating the rest of the ecosystem over to this repository. ed oBut for now, feel free to clone and test things out!
https://github.com/scala/scala

- Josh
P.S. If you have old forks, you may want to rename them and git remote set-url <old-scala-remote> git://github.com/scala/legacy-svn-scala.git

daniel
Joined: 2008-08-20,
User offline. Last seen 44 weeks 14 hours ago.
Re: Re: Scala Github repository is now live
Why did this have to be done as a filter branch rather than a simple commit?

Daniel
On Nov 30, 2011, at 11:44 PM, "Josh Suereth" <joshua [dot] suereth [at] gmail [dot] com> wrote:

Well, we expected to find at least one issue, and we did.
The pull/push binary libs scripts had a last minute fix for windows that unfortunately broke macintosh (due to uname differences between GNU coretools and POSIX).
The *only* change was a single line in the tools/binary-repo-libs.sh script, but this has generated new SHA's for all commits in the repository, so it mandated a re-fork.   We've verified that everything works on cygwin, linux and macintosh.   Please download and try it out.
I apologize to everyone for the necessity, but forks made today will have to be remade against the current scala/scala because the commit history has been altered.   
Note:  This is the *LAST* time history in git will be rewritten for Scala.   Each head (2.8.x, 2.9.x and master) is up-to-date and working, and we'll use regular old patches to move forward from this point.
Again, I apologize for any inconvenience.   We thank everyone for the pull requests so far, and we look forward to many more in the future!
- Josh


On Wed, Nov 30, 2011 at 2:17 PM, Josh Suereth <joshua [dot] suereth [at] gmail [dot] com> wrote:
Hello Scala Community,

I'm happy to inform you that the *new and clean* Scala git repository is now live and official.  Over the next few days, we'll be migrating the rest of the ecosystem over to this repository. ed oBut for now, feel free to clone and test things out!
https://github.com/scala/scala

- Josh
P.S. If you have old forks, you may want to rename them and git remote set-url <old-scala-remote> git://github.com/scala/legacy-svn-scala.git

extempore
Joined: 2008-12-17,
User offline. Last seen 35 weeks 3 days ago.
Re: Re: Scala Github repository is now live

On Wed, Nov 30, 2011 at 9:49 PM, Daniel Spiewak wrote:
> Why did this have to be done as a filter branch rather than a simple commit?

Because the reason it exists at all is so old revisions can be built.
As things stood, bootstrapping would fail on OSX for every revision in
the history.

Joshua.Suereth
Joined: 2008-09-02,
User offline. Last seen 32 weeks 5 days ago.
Re: Re: Scala Github repository is now live
Because it affects every commit in all history, and a majority of our developers use a Mac.   I don't make the rules, I just fix my mistakes.

On Thu, Dec 1, 2011 at 12:49 AM, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:
Why did this have to be done as a filter branch rather than a simple commit?

Daniel
On Nov 30, 2011, at 11:44 PM, "Josh Suereth" <joshua [dot] suereth [at] gmail [dot] com> wrote:

Well, we expected to find at least one issue, and we did.
The pull/push binary libs scripts had a last minute fix for windows that unfortunately broke macintosh (due to uname differences between GNU coretools and POSIX).
The *only* change was a single line in the tools/binary-repo-libs.sh script, but this has generated new SHA's for all commits in the repository, so it mandated a re-fork.   We've verified that everything works on cygwin, linux and macintosh.   Please download and try it out.
I apologize to everyone for the necessity, but forks made today will have to be remade against the current scala/scala because the commit history has been altered.   
Note:  This is the *LAST* time history in git will be rewritten for Scala.   Each head (2.8.x, 2.9.x and master) is up-to-date and working, and we'll use regular old patches to move forward from this point.
Again, I apologize for any inconvenience.   We thank everyone for the pull requests so far, and we look forward to many more in the future!
- Josh


On Wed, Nov 30, 2011 at 2:17 PM, Josh Suereth <joshua [dot] suereth [at] gmail [dot] com> wrote:
Hello Scala Community,

I'm happy to inform you that the *new and clean* Scala git repository is now live and official.  Over the next few days, we'll be migrating the rest of the ecosystem over to this repository. ed oBut for now, feel free to clone and test things out!
https://github.com/scala/scala

- Josh
P.S. If you have old forks, you may want to rename them and git remote set-url <old-scala-remote> git://github.com/scala/legacy-svn-scala.git


daniel
Joined: 2008-08-20,
User offline. Last seen 44 weeks 14 hours ago.
Re: Re: Scala Github repository is now live

Well we can't have that. :-) Just thought it was a valid question, since we all have to re-clone.

Daniel

On Nov 30, 2011, at 11:53 PM, "Paul Phillips" wrote:

> On Wed, Nov 30, 2011 at 9:49 PM, Daniel Spiewak wrote:
>> Why did this have to be done as a filter branch rather than a simple commit?
>
> Because the reason it exists at all is so old revisions can be built.
> As things stood, bootstrapping would fail on OSX for every revision in
> the history.

dcsobral
Joined: 2009-04-23,
User offline. Last seen 38 weeks 5 days ago.
Re: Re: Scala Github repository is now live

On Wed, Nov 30, 2011 at 18:57, Daniel Spiewak wrote:
> Note that it should be easy enough to adjust these pull requests so that
> they work on top of the new repository.  Basically, you need to do the
> following.  First, fix up the remote for the old scala repository so that it
> points to legacy-svn-scala (the easiest way to do this is to just edit
> .git/config).  Second, add a new remote for the new scala/scala repository.
> Fetch from that remote (do not pull).  Now, make sure that each of your pull
> requests are in separate branches (they really should be anyway).  Checkout
> those branches, then rebase them on top of the corresponding commits in the
> scala/master remote (where "scala" is assumed to be the remote name of the
> new scala/scala repository).  This rebase should happen cleanly.  Note that
> you may want to do rebase -i just to make sure that it doesn't pull in any
> redundant commits, but this shouldn't be necessary.  Once each of your
> commits is rebased, you can just `git remote rm` the legacy-svn remote and
> work exclusively with scala/scala.  No commit redoing required!

What exactly is the invocation for the rebase step? I always find that
the position of parameters such as branch names are unintuitive, the
intuitive one being the exact reverse, so I often commit stuff to
master by mistake, and I'd prefer to avoid that.

daniel
Joined: 2008-08-20,
User offline. Last seen 44 weeks 14 hours ago.
Re: Re: Scala Github repository is now live
  1. Find corresponding commit hash in the new repo (no automation to help you here)
  2. git checkout <branch-based-on-commit-in-old-repo>
  3. git rebase -i <commit-in-new-repo>
  4. Triple check that everything went well
I'm pretty sure it's also possible to rebase a specific chunk of commits on top of another commit, I just can't remember the syntax for it right now.  man git-rebase is your friend.  :-)

Daniel

On Thu, Dec 1, 2011 at 12:03 PM, Daniel Sobral <dcsobral [at] gmail [dot] com> wrote:
On Wed, Nov 30, 2011 at 18:57, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:
> Note that it should be easy enough to adjust these pull requests so that
> they work on top of the new repository.  Basically, you need to do the
> following.  First, fix up the remote for the old scala repository so that it
> points to legacy-svn-scala (the easiest way to do this is to just edit
> .git/config).  Second, add a new remote for the new scala/scala repository.
> Fetch from that remote (do not pull).  Now, make sure that each of your pull
> requests are in separate branches (they really should be anyway).  Checkout
> those branches, then rebase them on top of the corresponding commits in the
> scala/master remote (where "scala" is assumed to be the remote name of the
> new scala/scala repository).  This rebase should happen cleanly.  Note that
> you may want to do rebase -i just to make sure that it doesn't pull in any
> redundant commits, but this shouldn't be necessary.  Once each of your
> commits is rebased, you can just `git remote rm` the legacy-svn remote and
> work exclusively with scala/scala.  No commit redoing required!

What exactly is the invocation for the rebase step? I always find that
the position of parameters such as branch names are unintuitive, the
intuitive one being the exact reverse, so I often commit stuff to
master by mistake, and I'd prefer to avoid that.

--
Daniel C. Sobral

I travel to the future all the time.

dcsobral
Joined: 2009-04-23,
User offline. Last seen 38 weeks 5 days ago.
Re: Re: Scala Github repository is now live

On Thu, Dec 1, 2011 at 16:45, Daniel Spiewak wrote:
> Find corresponding commit hash in the new repo (no automation to help you
> here)
> git checkout
> git rebase -i
> Triple check that everything went well

Ah, ok. It doesn't work.

>
> I'm pretty sure it's also possible to rebase a specific chunk of commits on
> top of another commit, I just can't remember the syntax for it right now.
> man git-rebase is your friend.  :-)
>
> Daniel
>
> On Thu, Dec 1, 2011 at 12:03 PM, Daniel Sobral wrote:
>>
>> On Wed, Nov 30, 2011 at 18:57, Daniel Spiewak wrote:
>> > Note that it should be easy enough to adjust these pull requests so that
>> > they work on top of the new repository.  Basically, you need to do the
>> > following.  First, fix up the remote for the old scala repository so
>> > that it
>> > points to legacy-svn-scala (the easiest way to do this is to just edit
>> > .git/config).  Second, add a new remote for the new scala/scala
>> > repository.
>> > Fetch from that remote (do not pull).  Now, make sure that each of your
>> > pull
>> > requests are in separate branches (they really should be anyway).
>> > Checkout
>> > those branches, then rebase them on top of the corresponding commits in
>> > the
>> > scala/master remote (where "scala" is assumed to be the remote name of
>> > the
>> > new scala/scala repository).  This rebase should happen cleanly.  Note
>> > that
>> > you may want to do rebase -i just to make sure that it doesn't pull in
>> > any
>> > redundant commits, but this shouldn't be necessary.  Once each of your
>> > commits is rebased, you can just `git remote rm` the legacy-svn remote
>> > and
>> > work exclusively with scala/scala.  No commit redoing required!
>>
>> What exactly is the invocation for the rebase step? I always find that
>> the position of parameters such as branch names are unintuitive, the
>> intuitive one being the exact reverse, so I often commit stuff to
>> master by mistake, and I'd prefer to avoid that.
>>
>> --
>> Daniel C. Sobral
>>
>> I travel to the future all the time.
>
>

dcsobral
Joined: 2009-04-23,
User offline. Last seen 38 weeks 5 days ago.
Re: Re: Scala Github repository is now live

I'll be more verbose. I have this (simple pull request being used as
guinea pig):

commit c4a613c585faca06ba4a077bfbf3e979c4e6657b
Author: Daniel C. Sobral
Date: Mon Oct 31 14:12:59 2011 -0200

Example in scala.sys.process didn't match the text that describes it. Fixed.

commit 89b322757a36caaf10b1a38a6ca99c318c22e24c
Author: extempore
Date: Sat Oct 29 19:35:15 2011 +0000

Fix for crasher in explicitouter.

Closes SI-4970, review by moors.

git-svn-id:
http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25912
5e8d7ff9-d8ef-0310-90f0-a4852d11357a

On the new-master (based on the new scala/scala), I found this:

commit 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a
Author: Paul Phillips
Date: Sat Oct 29 19:35:15 2011 +0000

Fix for crasher in explicitouter.

Closes SI-4970, review by moors.

So I checked out my pull request branch, and run this:

cs@ayanami:~/github/scala (process/fix)$ git rebase --onto
2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a new-master
First, rewinding head to replay your work on top of it...
Applying: Syntax changes for tuples and sequences; symbols.
Using index info to reconstruct a base tree...
:171: trailing whitespace.
case FLOATLIT: case DOUBLELIT: case STRINGLIT:
:172: trailing whitespace.
case SYMBOLLIT: case NULL: case IDENTIFIER:
:173: trailing whitespace.
case THIS: case SUPER: case IF:
:174: trailing whitespace.
case FOR: case NEW: case USCORE:
:210: trailing whitespace.
return make.Select(pos,
warning: squelched 14 whitespace errors
warning: 19 lines add whitespace errors.
Falling back to patching base and 3-way merge...
CONFLICT (delete/modify): sources/scalac/ast/LazyTreeFactory.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/LazyTreeFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Transformer.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Transformer.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Traverser.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Traverser.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Tree.java deleted in HEAD
and modified in Syntax changes for tuples and sequences; symbols..
Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Tree.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeCopyFactory.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/TreeCopyFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeCreator.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/TreeCreator.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeFactory.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/TreeFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Parser.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Parser.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Scanner.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Scanner.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Tokens.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Tokens.java left in tree.
CONFLICT (delete/modify):
sources/scalac/ast/printer/TextTreePrinter.java deleted in HEAD and
modified in Syntax changes for tuples and sequences; symbols.. Version
Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/printer/TextTreePrinter.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Definitions.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/symtab/Definitions.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Modifiers.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Modifiers.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Symbol.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Symbol.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Type.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Type.java left in tree.
CONFLICT (delete/modify): sources/scalac/transformer/UnCurry.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/transformer/UnCurry.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/Analyzer.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/Analyzer.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/DeSugarize.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/DeSugarize.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/Infer.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/Infer.java left in tree.
CONFLICT (delete/modify): sources/scalac/util/Names.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/util/Names.java left in tree.
Failed to merge in the changes.
Patch failed at 0001 Syntax changes for tuples and sequences; symbols.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

On Thu, Dec 1, 2011 at 16:47, Daniel Sobral wrote:
> On Thu, Dec 1, 2011 at 16:45, Daniel Spiewak wrote:
>> Find corresponding commit hash in the new repo (no automation to help you
>> here)
>> git checkout
>> git rebase -i
>> Triple check that everything went well
>
> Ah, ok. It doesn't work.
>
>>
>> I'm pretty sure it's also possible to rebase a specific chunk of commits on
>> top of another commit, I just can't remember the syntax for it right now.
>> man git-rebase is your friend.  :-)
>>
>> Daniel
>>
>> On Thu, Dec 1, 2011 at 12:03 PM, Daniel Sobral wrote:
>>>
>>> On Wed, Nov 30, 2011 at 18:57, Daniel Spiewak wrote:
>>> > Note that it should be easy enough to adjust these pull requests so that
>>> > they work on top of the new repository.  Basically, you need to do the
>>> > following.  First, fix up the remote for the old scala repository so
>>> > that it
>>> > points to legacy-svn-scala (the easiest way to do this is to just edit
>>> > .git/config).  Second, add a new remote for the new scala/scala
>>> > repository.
>>> > Fetch from that remote (do not pull).  Now, make sure that each of your
>>> > pull
>>> > requests are in separate branches (they really should be anyway).
>>> > Checkout
>>> > those branches, then rebase them on top of the corresponding commits in
>>> > the
>>> > scala/master remote (where "scala" is assumed to be the remote name of
>>> > the
>>> > new scala/scala repository).  This rebase should happen cleanly.  Note
>>> > that
>>> > you may want to do rebase -i just to make sure that it doesn't pull in
>>> > any
>>> > redundant commits, but this shouldn't be necessary.  Once each of your
>>> > commits is rebased, you can just `git remote rm` the legacy-svn remote
>>> > and
>>> > work exclusively with scala/scala.  No commit redoing required!
>>>
>>> What exactly is the invocation for the rebase step? I always find that
>>> the position of parameters such as branch names are unintuitive, the
>>> intuitive one being the exact reverse, so I often commit stuff to
>>> master by mistake, and I'd prefer to avoid that.
>>>
>>> --
>>> Daniel C. Sobral
>>>
>>> I travel to the future all the time.
>>
>>
>
>
>
> --
> Daniel C. Sobral
>
> I travel to the future all the time.
>

daniel
Joined: 2008-08-20,
User offline. Last seen 44 weeks 14 hours ago.
Re: Re: Scala Github repository is now live

On Thu, Dec 1, 2011 at 16:45, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:
> Find corresponding commit hash in the new repo (no automation to help you
> here)
> git checkout <branch-based-on-commit-in-old-repo>
> git rebase -i <commit-in-new-repo>
> Triple check that everything went well

Ah, ok. It doesn't work.

Where does it go wrong?

Daniel
daniel
Joined: 2008-08-20,
User offline. Last seen 44 weeks 14 hours ago.
Re: Re: Scala Github repository is now live
Try the following:

$ git checkout c4a613c58
$ git rebase -i 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a
<make sure to remove all commits except for c4a613c58>

Daniel

On Thu, Dec 1, 2011 at 12:53 PM, Daniel Sobral <dcsobral [at] gmail [dot] com> wrote:
I'll be more verbose. I have this (simple pull request being used as
guinea pig):

commit c4a613c585faca06ba4a077bfbf3e979c4e6657b
Author: Daniel C. Sobral <dcsobral [at] gmail [dot] com>
Date:   Mon Oct 31 14:12:59 2011 -0200

   Example in scala.sys.process didn't match the text that describes it. Fixed.

commit 89b322757a36caaf10b1a38a6ca99c318c22e24c
Author: extempore <extempore@5e8d7ff9-d8ef-0310-90f0-a4852d11357a>
Date:   Sat Oct 29 19:35:15 2011 +0000

   Fix for crasher in explicitouter.

   Closes SI-4970, review by moors.

   git-svn-id:
http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25912
5e8d7ff9-d8ef-0310-90f0-a4852d11357a

On the new-master (based on the new scala/scala), I found this:

commit 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a
Author: Paul Phillips <paulp [at] improving [dot] org>
Date:   Sat Oct 29 19:35:15 2011 +0000

   Fix for crasher in explicitouter.

   Closes SI-4970, review by moors.


So I checked out my pull request branch, and run this:

cs@ayanami:~/github/scala (process/fix)$ git rebase --onto
2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a new-master
First, rewinding head to replay your work on top of it...
Applying: Syntax changes for tuples and sequences; symbols.
Using index info to reconstruct a base tree...
<stdin>:171: trailing whitespace.
       case FLOATLIT: case DOUBLELIT: case STRINGLIT:
<stdin>:172: trailing whitespace.
       case SYMBOLLIT: case NULL: case IDENTIFIER:
<stdin>:173: trailing whitespace.
       case THIS: case SUPER: case IF:
<stdin>:174: trailing whitespace.
       case FOR: case NEW: case USCORE:
<stdin>:210: trailing whitespace.
       return make.Select(pos,
warning: squelched 14 whitespace errors
warning: 19 lines add whitespace errors.
Falling back to patching base and 3-way merge...
CONFLICT (delete/modify): sources/scalac/ast/LazyTreeFactory.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/LazyTreeFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Transformer.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Transformer.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Traverser.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Traverser.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Tree.java deleted in HEAD
and modified in Syntax changes for tuples and sequences; symbols..
Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Tree.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeCopyFactory.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/TreeCopyFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeCreator.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/TreeCreator.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeFactory.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/TreeFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Parser.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Parser.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Scanner.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Scanner.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Tokens.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Tokens.java left in tree.
CONFLICT (delete/modify):
sources/scalac/ast/printer/TextTreePrinter.java deleted in HEAD and
modified in Syntax changes for tuples and sequences; symbols.. Version
Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/printer/TextTreePrinter.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Definitions.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/symtab/Definitions.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Modifiers.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Modifiers.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Symbol.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Symbol.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Type.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Type.java left in tree.
CONFLICT (delete/modify): sources/scalac/transformer/UnCurry.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/transformer/UnCurry.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/Analyzer.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/Analyzer.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/DeSugarize.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/DeSugarize.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/Infer.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/Infer.java left in tree.
CONFLICT (delete/modify): sources/scalac/util/Names.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/util/Names.java left in tree.
Failed to merge in the changes.
Patch failed at 0001 Syntax changes for tuples and sequences; symbols.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".




On Thu, Dec 1, 2011 at 16:47, Daniel Sobral <dcsobral [at] gmail [dot] com> wrote:
> On Thu, Dec 1, 2011 at 16:45, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:
>> Find corresponding commit hash in the new repo (no automation to help you
>> here)
>> git checkout <branch-based-on-commit-in-old-repo>
>> git rebase -i <commit-in-new-repo>
>> Triple check that everything went well
>
> Ah, ok. It doesn't work.
>
>>
>> I'm pretty sure it's also possible to rebase a specific chunk of commits on
>> top of another commit, I just can't remember the syntax for it right now.
>> man git-rebase is your friend.  :-)
>>
>> Daniel
>>
>> On Thu, Dec 1, 2011 at 12:03 PM, Daniel Sobral <dcsobral [at] gmail [dot] com> wrote:
>>>
>>> On Wed, Nov 30, 2011 at 18:57, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:
>>> > Note that it should be easy enough to adjust these pull requests so that
>>> > they work on top of the new repository.  Basically, you need to do the
>>> > following.  First, fix up the remote for the old scala repository so
>>> > that it
>>> > points to legacy-svn-scala (the easiest way to do this is to just edit
>>> > .git/config).  Second, add a new remote for the new scala/scala
>>> > repository.
>>> > Fetch from that remote (do not pull).  Now, make sure that each of your
>>> > pull
>>> > requests are in separate branches (they really should be anyway).
>>> > Checkout
>>> > those branches, then rebase them on top of the corresponding commits in
>>> > the
>>> > scala/master remote (where "scala" is assumed to be the remote name of
>>> > the
>>> > new scala/scala repository).  This rebase should happen cleanly.  Note
>>> > that
>>> > you may want to do rebase -i just to make sure that it doesn't pull in
>>> > any
>>> > redundant commits, but this shouldn't be necessary.  Once each of your
>>> > commits is rebased, you can just `git remote rm` the legacy-svn remote
>>> > and
>>> > work exclusively with scala/scala.  No commit redoing required!
>>>
>>> What exactly is the invocation for the rebase step? I always find that
>>> the position of parameters such as branch names are unintuitive, the
>>> intuitive one being the exact reverse, so I often commit stuff to
>>> master by mistake, and I'd prefer to avoid that.
>>>
>>> --
>>> Daniel C. Sobral
>>>
>>> I travel to the future all the time.
>>
>>
>
>
>
> --
> Daniel C. Sobral
>
> I travel to the future all the time.
>



--
Daniel C. Sobral

I travel to the future all the time.

dcsobral
Joined: 2009-04-23,
User offline. Last seen 38 weeks 5 days ago.
Re: Re: Scala Github repository is now live

Seems to work, except that I have to create a new branch if I checkout a commit.

On Thu, Dec 1, 2011 at 16:57, Daniel Spiewak wrote:
> Try the following:
>
> $ git checkout c4a613c58
> $ git rebase -i 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a
>
>
> Daniel
>
> On Thu, Dec 1, 2011 at 12:53 PM, Daniel Sobral wrote:
>>
>> I'll be more verbose. I have this (simple pull request being used as
>> guinea pig):
>>
>> commit c4a613c585faca06ba4a077bfbf3e979c4e6657b
>> Author: Daniel C. Sobral
>> Date:   Mon Oct 31 14:12:59 2011 -0200
>>
>>    Example in scala.sys.process didn't match the text that describes it.
>> Fixed.
>>
>> commit 89b322757a36caaf10b1a38a6ca99c318c22e24c
>> Author: extempore
>> Date:   Sat Oct 29 19:35:15 2011 +0000
>>
>>    Fix for crasher in explicitouter.
>>
>>    Closes SI-4970, review by moors.
>>
>>    git-svn-id:
>> http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25912
>> 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
>>
>> On the new-master (based on the new scala/scala), I found this:
>>
>> commit 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a
>> Author: Paul Phillips
>> Date:   Sat Oct 29 19:35:15 2011 +0000
>>
>>    Fix for crasher in explicitouter.
>>
>>    Closes SI-4970, review by moors.
>>
>>
>> So I checked out my pull request branch, and run this:
>>
>> cs@ayanami:~/github/scala (process/fix)$ git rebase --onto
>> 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a new-master
>> First, rewinding head to replay your work on top of it...
>> Applying: Syntax changes for tuples and sequences; symbols.
>> Using index info to reconstruct a base tree...
>> :171: trailing whitespace.
>>        case FLOATLIT: case DOUBLELIT: case STRINGLIT:
>> :172: trailing whitespace.
>>        case SYMBOLLIT: case NULL: case IDENTIFIER:
>> :173: trailing whitespace.
>>        case THIS: case SUPER: case IF:
>> :174: trailing whitespace.
>>        case FOR: case NEW: case USCORE:
>> :210: trailing whitespace.
>>        return make.Select(pos,
>> warning: squelched 14 whitespace errors
>> warning: 19 lines add whitespace errors.
>> Falling back to patching base and 3-way merge...
>> CONFLICT (delete/modify): sources/scalac/ast/LazyTreeFactory.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/ast/LazyTreeFactory.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/Transformer.java deleted
>> in HEAD and modified in Syntax changes for tuples and sequences;
>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/ast/Transformer.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/Traverser.java deleted in
>> HEAD and modified in Syntax changes for tuples and sequences;
>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/ast/Traverser.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/Tree.java deleted in HEAD
>> and modified in Syntax changes for tuples and sequences; symbols..
>> Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/ast/Tree.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/TreeCopyFactory.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/ast/TreeCopyFactory.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/TreeCreator.java deleted
>> in HEAD and modified in Syntax changes for tuples and sequences;
>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/ast/TreeCreator.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/TreeFactory.java deleted
>> in HEAD and modified in Syntax changes for tuples and sequences;
>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/ast/TreeFactory.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/parser/Parser.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/ast/parser/Parser.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/parser/Scanner.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/ast/parser/Scanner.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/ast/parser/Tokens.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/ast/parser/Tokens.java left in tree.
>> CONFLICT (delete/modify):
>> sources/scalac/ast/printer/TextTreePrinter.java deleted in HEAD and
>> modified in Syntax changes for tuples and sequences; symbols.. Version
>> Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/ast/printer/TextTreePrinter.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/symtab/Definitions.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/symtab/Definitions.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/symtab/Modifiers.java deleted
>> in HEAD and modified in Syntax changes for tuples and sequences;
>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/symtab/Modifiers.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/symtab/Symbol.java deleted in
>> HEAD and modified in Syntax changes for tuples and sequences;
>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/symtab/Symbol.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/symtab/Type.java deleted in
>> HEAD and modified in Syntax changes for tuples and sequences;
>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/symtab/Type.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/transformer/UnCurry.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/transformer/UnCurry.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/typechecker/Analyzer.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/typechecker/Analyzer.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/typechecker/DeSugarize.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/typechecker/DeSugarize.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/typechecker/Infer.java
>> deleted in HEAD and modified in Syntax changes for tuples and
>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>> symbols. of sources/scalac/typechecker/Infer.java left in tree.
>> CONFLICT (delete/modify): sources/scalac/util/Names.java deleted in
>> HEAD and modified in Syntax changes for tuples and sequences;
>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>> sources/scalac/util/Names.java left in tree.
>> Failed to merge in the changes.
>> Patch failed at 0001 Syntax changes for tuples and sequences; symbols.
>>
>> When you have resolved this problem run "git rebase --continue".
>> If you would prefer to skip this patch, instead run "git rebase --skip".
>> To restore the original branch and stop rebasing run "git rebase --abort".
>>
>>
>>
>>
>> On Thu, Dec 1, 2011 at 16:47, Daniel Sobral wrote:
>> > On Thu, Dec 1, 2011 at 16:45, Daniel Spiewak
>> > wrote:
>> >> Find corresponding commit hash in the new repo (no automation to help
>> >> you
>> >> here)
>> >> git checkout
>> >> git rebase -i
>> >> Triple check that everything went well
>> >
>> > Ah, ok. It doesn't work.
>> >
>> >>
>> >> I'm pretty sure it's also possible to rebase a specific chunk of
>> >> commits on
>> >> top of another commit, I just can't remember the syntax for it right
>> >> now.
>> >> man git-rebase is your friend.  :-)
>> >>
>> >> Daniel
>> >>
>> >> On Thu, Dec 1, 2011 at 12:03 PM, Daniel Sobral
>> >> wrote:
>> >>>
>> >>> On Wed, Nov 30, 2011 at 18:57, Daniel Spiewak
>> >>> wrote:
>> >>> > Note that it should be easy enough to adjust these pull requests so
>> >>> > that
>> >>> > they work on top of the new repository.  Basically, you need to do
>> >>> > the
>> >>> > following.  First, fix up the remote for the old scala repository so
>> >>> > that it
>> >>> > points to legacy-svn-scala (the easiest way to do this is to just
>> >>> > edit
>> >>> > .git/config).  Second, add a new remote for the new scala/scala
>> >>> > repository.
>> >>> > Fetch from that remote (do not pull).  Now, make sure that each of
>> >>> > your
>> >>> > pull
>> >>> > requests are in separate branches (they really should be anyway).
>> >>> > Checkout
>> >>> > those branches, then rebase them on top of the corresponding commits
>> >>> > in
>> >>> > the
>> >>> > scala/master remote (where "scala" is assumed to be the remote name
>> >>> > of
>> >>> > the
>> >>> > new scala/scala repository).  This rebase should happen cleanly.
>> >>> > Note
>> >>> > that
>> >>> > you may want to do rebase -i just to make sure that it doesn't pull
>> >>> > in
>> >>> > any
>> >>> > redundant commits, but this shouldn't be necessary.  Once each of
>> >>> > your
>> >>> > commits is rebased, you can just `git remote rm` the legacy-svn
>> >>> > remote
>> >>> > and
>> >>> > work exclusively with scala/scala.  No commit redoing required!
>> >>>
>> >>> What exactly is the invocation for the rebase step? I always find that
>> >>> the position of parameters such as branch names are unintuitive, the
>> >>> intuitive one being the exact reverse, so I often commit stuff to
>> >>> master by mistake, and I'd prefer to avoid that.
>> >>>
>> >>> --
>> >>> Daniel C. Sobral
>> >>>
>> >>> I travel to the future all the time.
>> >>
>> >>
>> >
>> >
>> >
>> > --
>> > Daniel C. Sobral
>> >
>> > I travel to the future all the time.
>> >
>>
>>
>>
>> --
>> Daniel C. Sobral
>>
>> I travel to the future all the time.
>
>

daniel
Joined: 2008-08-20,
User offline. Last seen 44 weeks 14 hours ago.
Re: Re: Scala Github repository is now live

You can use branch -f to force a repoint of the old branch. Otherwise, yes, I do recommend using branches rather than raw commits where possible.

The key thing to remember with this rebasing is to find the corresponding base commit in the new repo. Don't try to rebase onto the new master right away, since that introduces variables that rebase cannot always resolve.

Daniel

On Dec 1, 2011, at 1:12 PM, "Daniel Sobral" wrote:

> Seems to work, except that I have to create a new branch if I checkout a commit.
>
> On Thu, Dec 1, 2011 at 16:57, Daniel Spiewak wrote:
>> Try the following:
>>
>> $ git checkout c4a613c58
>> $ git rebase -i 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a
>>
>>
>> Daniel
>>
>> On Thu, Dec 1, 2011 at 12:53 PM, Daniel Sobral wrote:
>>>
>>> I'll be more verbose. I have this (simple pull request being used as
>>> guinea pig):
>>>
>>> commit c4a613c585faca06ba4a077bfbf3e979c4e6657b
>>> Author: Daniel C. Sobral
>>> Date: Mon Oct 31 14:12:59 2011 -0200
>>>
>>> Example in scala.sys.process didn't match the text that describes it.
>>> Fixed.
>>>
>>> commit 89b322757a36caaf10b1a38a6ca99c318c22e24c
>>> Author: extempore
>>> Date: Sat Oct 29 19:35:15 2011 +0000
>>>
>>> Fix for crasher in explicitouter.
>>>
>>> Closes SI-4970, review by moors.
>>>
>>> git-svn-id:
>>> http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25912
>>> 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
>>>
>>> On the new-master (based on the new scala/scala), I found this:
>>>
>>> commit 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a
>>> Author: Paul Phillips
>>> Date: Sat Oct 29 19:35:15 2011 +0000
>>>
>>> Fix for crasher in explicitouter.
>>>
>>> Closes SI-4970, review by moors.
>>>
>>>
>>> So I checked out my pull request branch, and run this:
>>>
>>> cs@ayanami:~/github/scala (process/fix)$ git rebase --onto
>>> 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a new-master
>>> First, rewinding head to replay your work on top of it...
>>> Applying: Syntax changes for tuples and sequences; symbols.
>>> Using index info to reconstruct a base tree...
>>> :171: trailing whitespace.
>>> case FLOATLIT: case DOUBLELIT: case STRINGLIT:
>>> :172: trailing whitespace.
>>> case SYMBOLLIT: case NULL: case IDENTIFIER:
>>> :173: trailing whitespace.
>>> case THIS: case SUPER: case IF:
>>> :174: trailing whitespace.
>>> case FOR: case NEW: case USCORE:
>>> :210: trailing whitespace.
>>> return make.Select(pos,
>>> warning: squelched 14 whitespace errors
>>> warning: 19 lines add whitespace errors.
>>> Falling back to patching base and 3-way merge...
>>> CONFLICT (delete/modify): sources/scalac/ast/LazyTreeFactory.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/ast/LazyTreeFactory.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/Transformer.java deleted
>>> in HEAD and modified in Syntax changes for tuples and sequences;
>>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/ast/Transformer.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/Traverser.java deleted in
>>> HEAD and modified in Syntax changes for tuples and sequences;
>>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/ast/Traverser.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/Tree.java deleted in HEAD
>>> and modified in Syntax changes for tuples and sequences; symbols..
>>> Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/ast/Tree.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/TreeCopyFactory.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/ast/TreeCopyFactory.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/TreeCreator.java deleted
>>> in HEAD and modified in Syntax changes for tuples and sequences;
>>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/ast/TreeCreator.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/TreeFactory.java deleted
>>> in HEAD and modified in Syntax changes for tuples and sequences;
>>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/ast/TreeFactory.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/parser/Parser.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/ast/parser/Parser.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/parser/Scanner.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/ast/parser/Scanner.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/ast/parser/Tokens.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/ast/parser/Tokens.java left in tree.
>>> CONFLICT (delete/modify):
>>> sources/scalac/ast/printer/TextTreePrinter.java deleted in HEAD and
>>> modified in Syntax changes for tuples and sequences; symbols.. Version
>>> Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/ast/printer/TextTreePrinter.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/symtab/Definitions.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/symtab/Definitions.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/symtab/Modifiers.java deleted
>>> in HEAD and modified in Syntax changes for tuples and sequences;
>>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/symtab/Modifiers.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/symtab/Symbol.java deleted in
>>> HEAD and modified in Syntax changes for tuples and sequences;
>>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/symtab/Symbol.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/symtab/Type.java deleted in
>>> HEAD and modified in Syntax changes for tuples and sequences;
>>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/symtab/Type.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/transformer/UnCurry.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/transformer/UnCurry.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/typechecker/Analyzer.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/typechecker/Analyzer.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/typechecker/DeSugarize.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/typechecker/DeSugarize.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/typechecker/Infer.java
>>> deleted in HEAD and modified in Syntax changes for tuples and
>>> sequences; symbols.. Version Syntax changes for tuples and sequences;
>>> symbols. of sources/scalac/typechecker/Infer.java left in tree.
>>> CONFLICT (delete/modify): sources/scalac/util/Names.java deleted in
>>> HEAD and modified in Syntax changes for tuples and sequences;
>>> symbols.. Version Syntax changes for tuples and sequences; symbols. of
>>> sources/scalac/util/Names.java left in tree.
>>> Failed to merge in the changes.
>>> Patch failed at 0001 Syntax changes for tuples and sequences; symbols.
>>>
>>> When you have resolved this problem run "git rebase --continue".
>>> If you would prefer to skip this patch, instead run "git rebase --skip".
>>> To restore the original branch and stop rebasing run "git rebase --abort".
>>>
>>>
>>>
>>>
>>> On Thu, Dec 1, 2011 at 16:47, Daniel Sobral wrote:
>>>> On Thu, Dec 1, 2011 at 16:45, Daniel Spiewak
>>>> wrote:
>>>>> Find corresponding commit hash in the new repo (no automation to help
>>>>> you
>>>>> here)
>>>>> git checkout
>>>>> git rebase -i
>>>>> Triple check that everything went well
>>>>
>>>> Ah, ok. It doesn't work.
>>>>
>>>>>
>>>>> I'm pretty sure it's also possible to rebase a specific chunk of
>>>>> commits on
>>>>> top of another commit, I just can't remember the syntax for it right
>>>>> now.
>>>>> man git-rebase is your friend. :-)
>>>>>
>>>>> Daniel
>>>>>
>>>>> On Thu, Dec 1, 2011 at 12:03 PM, Daniel Sobral
>>>>> wrote:
>>>>>>
>>>>>> On Wed, Nov 30, 2011 at 18:57, Daniel Spiewak
>>>>>> wrote:
>>>>>>> Note that it should be easy enough to adjust these pull requests so
>>>>>>> that
>>>>>>> they work on top of the new repository. Basically, you need to do
>>>>>>> the
>>>>>>> following. First, fix up the remote for the old scala repository so
>>>>>>> that it
>>>>>>> points to legacy-svn-scala (the easiest way to do this is to just
>>>>>>> edit
>>>>>>> .git/config). Second, add a new remote for the new scala/scala
>>>>>>> repository.
>>>>>>> Fetch from that remote (do not pull). Now, make sure that each of
>>>>>>> your
>>>>>>> pull
>>>>>>> requests are in separate branches (they really should be anyway).
>>>>>>> Checkout
>>>>>>> those branches, then rebase them on top of the corresponding commits
>>>>>>> in
>>>>>>> the
>>>>>>> scala/master remote (where "scala" is assumed to be the remote name
>>>>>>> of
>>>>>>> the
>>>>>>> new scala/scala repository). This rebase should happen cleanly.
>>>>>>> Note
>>>>>>> that
>>>>>>> you may want to do rebase -i just to make sure that it doesn't pull
>>>>>>> in
>>>>>>> any
>>>>>>> redundant commits, but this shouldn't be necessary. Once each of
>>>>>>> your
>>>>>>> commits is rebased, you can just `git remote rm` the legacy-svn
>>>>>>> remote
>>>>>>> and
>>>>>>> work exclusively with scala/scala. No commit redoing required!
>>>>>>
>>>>>> What exactly is the invocation for the rebase step? I always find that
>>>>>> the position of parameters such as branch names are unintuitive, the
>>>>>> intuitive one being the exact reverse, so I often commit stuff to
>>>>>> master by mistake, and I'd prefer to avoid that.
>>>>>>
>>>>>> --
>>>>>> Daniel C. Sobral
>>>>>>
>>>>>> I travel to the future all the time.
>>>>>
>>>>>
>>>>
>>>>
>>>>
>>>> --
>>>> Daniel C. Sobral
>>>>
>>>> I travel to the future all the time.
>>>>
>>>
>>>
>>>
>>> --
>>> Daniel C. Sobral
>>>
>>> I travel to the future all the time.
>>
>>
>
>
>

Greg Price
Joined: 2011-09-06,
User offline. Last seen 42 years 45 weeks ago.
Re: Re: Scala Github repository is now live
It sounds like you got a workaround eventually, but in case this is helpful for anyone else: the command you wanted was $ git rebase --onto 2d3fe57 89b3227 HEADi.e., $ git rebase --onto new-master old-master my-changes
That takes just the commits from old-master..my-changes, and replays them in sequence onto new-master.
(You ran git rebase --onto 2d3fe57 new-master; I'm not sure what new-master was, but if it was a name for the new master branch, then that's the same thing as 2d3fe57. So you were telling rebase to take all the commits from new-master..my-changes, which includes all the commits in old-master since new-master split off, and replay those. That isn't what you wanted and it's going to have tons of conflicts.)
The git-rebase man page explains all this, in principle, but really isn't as helpful as it should be.
Greg


On Thu, Dec 1, 2011 at 10:53 AM, Daniel Sobral <dcsobral [at] gmail [dot] com> wrote:
I'll be more verbose. I have this (simple pull request being used as
guinea pig):

commit c4a613c585faca06ba4a077bfbf3e979c4e6657b
Author: Daniel C. Sobral <dcsobral [at] gmail [dot] com>
Date:   Mon Oct 31 14:12:59 2011 -0200

   Example in scala.sys.process didn't match the text that describes it. Fixed.

commit 89b322757a36caaf10b1a38a6ca99c318c22e24c
Author: extempore <extempore@5e8d7ff9-d8ef-0310-90f0-a4852d11357a>
Date:   Sat Oct 29 19:35:15 2011 +0000

   Fix for crasher in explicitouter.

   Closes SI-4970, review by moors.

   git-svn-id:
http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25912
5e8d7ff9-d8ef-0310-90f0-a4852d11357a

On the new-master (based on the new scala/scala), I found this:

commit 2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a
Author: Paul Phillips <paulp [at] improving [dot] org>
Date:   Sat Oct 29 19:35:15 2011 +0000

   Fix for crasher in explicitouter.

   Closes SI-4970, review by moors.


So I checked out my pull request branch, and run this:

cs@ayanami:~/github/scala (process/fix)$ git rebase --onto
2d3fe5733cbc6bcf06892c8ee3cb19f7987f6b6a new-master
First, rewinding head to replay your work on top of it...
Applying: Syntax changes for tuples and sequences; symbols.
Using index info to reconstruct a base tree...
<stdin>:171: trailing whitespace.
       case FLOATLIT: case DOUBLELIT: case STRINGLIT:
<stdin>:172: trailing whitespace.
       case SYMBOLLIT: case NULL: case IDENTIFIER:
<stdin>:173: trailing whitespace.
       case THIS: case SUPER: case IF:
<stdin>:174: trailing whitespace.
       case FOR: case NEW: case USCORE:
<stdin>:210: trailing whitespace.
       return make.Select(pos,
warning: squelched 14 whitespace errors
warning: 19 lines add whitespace errors.
Falling back to patching base and 3-way merge...
CONFLICT (delete/modify): sources/scalac/ast/LazyTreeFactory.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/LazyTreeFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Transformer.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Transformer.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Traverser.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Traverser.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/Tree.java deleted in HEAD
and modified in Syntax changes for tuples and sequences; symbols..
Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/Tree.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeCopyFactory.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/TreeCopyFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeCreator.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/TreeCreator.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/TreeFactory.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/TreeFactory.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Parser.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Parser.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Scanner.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Scanner.java left in tree.
CONFLICT (delete/modify): sources/scalac/ast/parser/Tokens.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/ast/parser/Tokens.java left in tree.
CONFLICT (delete/modify):
sources/scalac/ast/printer/TextTreePrinter.java deleted in HEAD and
modified in Syntax changes for tuples and sequences; symbols.. Version
Syntax changes for tuples and sequences; symbols. of
sources/scalac/ast/printer/TextTreePrinter.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Definitions.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/symtab/Definitions.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Modifiers.java deleted
in HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Modifiers.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Symbol.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Symbol.java left in tree.
CONFLICT (delete/modify): sources/scalac/symtab/Type.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/symtab/Type.java left in tree.
CONFLICT (delete/modify): sources/scalac/transformer/UnCurry.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/transformer/UnCurry.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/Analyzer.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/Analyzer.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/DeSugarize.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/DeSugarize.java left in tree.
CONFLICT (delete/modify): sources/scalac/typechecker/Infer.java
deleted in HEAD and modified in Syntax changes for tuples and
sequences; symbols.. Version Syntax changes for tuples and sequences;
symbols. of sources/scalac/typechecker/Infer.java left in tree.
CONFLICT (delete/modify): sources/scalac/util/Names.java deleted in
HEAD and modified in Syntax changes for tuples and sequences;
symbols.. Version Syntax changes for tuples and sequences; symbols. of
sources/scalac/util/Names.java left in tree.
Failed to merge in the changes.
Patch failed at 0001 Syntax changes for tuples and sequences; symbols.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".




On Thu, Dec 1, 2011 at 16:47, Daniel Sobral <dcsobral [at] gmail [dot] com> wrote:
> On Thu, Dec 1, 2011 at 16:45, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:
>> Find corresponding commit hash in the new repo (no automation to help you
>> here)
>> git checkout <branch-based-on-commit-in-old-repo>
>> git rebase -i <commit-in-new-repo>
>> Triple check that everything went well
>
> Ah, ok. It doesn't work.
>
>>
>> I'm pretty sure it's also possible to rebase a specific chunk of commits on
>> top of another commit, I just can't remember the syntax for it right now.
>> man git-rebase is your friend.  :-)
>>
>> Daniel
>>
>> On Thu, Dec 1, 2011 at 12:03 PM, Daniel Sobral <dcsobral [at] gmail [dot] com> wrote:
>>>
>>> On Wed, Nov 30, 2011 at 18:57, Daniel Spiewak <djspiewak [at] gmail [dot] com> wrote:
>>> > Note that it should be easy enough to adjust these pull requests so that
>>> > they work on top of the new repository.  Basically, you need to do the
>>> > following.  First, fix up the remote for the old scala repository so
>>> > that it
>>> > points to legacy-svn-scala (the easiest way to do this is to just edit
>>> > .git/config).  Second, add a new remote for the new scala/scala
>>> > repository.
>>> > Fetch from that remote (do not pull).  Now, make sure that each of your
>>> > pull
>>> > requests are in separate branches (they really should be anyway).
>>> > Checkout
>>> > those branches, then rebase them on top of the corresponding commits in
>>> > the
>>> > scala/master remote (where "scala" is assumed to be the remote name of
>>> > the
>>> > new scala/scala repository).  This rebase should happen cleanly.  Note
>>> > that
>>> > you may want to do rebase -i just to make sure that it doesn't pull in
>>> > any
>>> > redundant commits, but this shouldn't be necessary.  Once each of your
>>> > commits is rebased, you can just `git remote rm` the legacy-svn remote
>>> > and
>>> > work exclusively with scala/scala.  No commit redoing required!
>>>
>>> What exactly is the invocation for the rebase step? I always find that
>>> the position of parameters such as branch names are unintuitive, the
>>> intuitive one being the exact reverse, so I often commit stuff to
>>> master by mistake, and I'd prefer to avoid that.
>>>
>>> --
>>> Daniel C. Sobral
>>>
>>> I travel to the future all the time.
>>
>>
>
>
>
> --
> Daniel C. Sobral
>
> I travel to the future all the time.
>



--
Daniel C. Sobral

I travel to the future all the time.

Copyright © 2012 École Polytechnique Fédérale de Lausanne (EPFL), Lausanne, Switzerland