Done! Everyone should merge with master and deal with the conflicts as soon
as possible. Chances are high that you will have to do a manual merge but
the merge was very painless (at least for my branches).
On Sun, Jun 16, 2013 at 10:39 PM, Owen Williams owilli...@mixxx.org wrote:
Yeah I don't
I just tried this (getting rid of mixxx/) in a local branch and then merged
the changes into another topic branch (features_key).
The only conflicts were files I had deleted in features_key that were moved
in master. Every file I had created in features_key was still in mixxx/ so
I had to move
Yeah I don't think that's a huge problem. Let's go ahead and do this.
This is also a good choice for a sort of migration epoch: most commits
pre-move are launchpad, and all commits post-move are git.
On Sun, 2013-06-16 at 18:45 -0400, RJ Ryan wrote:
I just tried this (getting rid of mixxx/) in
Now that everyone is getting disrupted by the bzr to git switch, there's no
time like now to get rid of the 'mixxx' folder inside the repository. I
plan on just doing a git mv on all the contents of mixxx/*. Merges should
still work fine as git can cope with files that have been modified in one
That should be fine as long as we nver sync from launchpad trunk
again.
speaking of which, maybe I should sync from trunk one more time before
you do that :)
On Thu, 2013-06-13 at 15:24 -0400, RJ Ryan wrote:
Now that everyone is getting disrupted by the bzr to git switch,
there's no
Hm, can't you just merge with github master instead of assuming it will
apply fast-forwarded? That will be true regardless of whether we do this
move if there are any commits to lp:mixxx after we've all switched to
committing on GitHub.
On Thu, Jun 13, 2013 at 3:43 PM, Owen Williams
Maybe also commit an update to lp:mixxx that deletes everything but a
README saying use github now?
On Thu, 2013-06-13 at 15:24 -0400, RJ Ryan wrote:
Now that everyone is getting disrupted by the bzr to git switch,
there's no time like now to get rid of the 'mixxx' folder inside the
I'm so for that. While you are at it can we also get rid of
mixxx-winlib32-msvc? There is only one header file in there.
On Thu, 13 Jun 2013 15:24:01 -0400
RJ Ryan rr...@mixxx.org wrote:
Now that everyone is getting disrupted by the bzr to git switch, there's no
time like now to get rid of
On Thu, Jun 13, 2013 at 5:00 PM, Owen Williams owilli...@mixxx.org wrote:
that may work, but anything that complicates the migration procedure
risks causing problems for other branches, history, etc. As soon as lp
and github get out of sync, it's going to be very tough to migrate any
other
