Unable to Merge or Rebase branch since update
austinrivas opened this issue · 8 comments
Since updating to 4.0 ( about 5 minutes ago ) I have been unable to merge or rebase branches using the old workflow.
@FredrikNoren to replicate you can just fork austinrivas.meteor.com, ungit as usual, and try to merge iron-router with dev and dev with master
I tried cloning that repository and performing the merges (also tried rebase) and it all seems to work in 0.4.0 for me. What kind of errors are you getting? (Both if there are errors in the ui, and if there are errors in the consoles)
I tried uninstalling ungit and reinstalling, but now ungit can't even start up.
It will connect initially, start the browser, then lose the connection twice before stopping al together.
Here is the console output :
austinrivas@Austins-MacBook-Pro austinrivas.meteor.com (master) $ ungit
info: BugTracker set version: 0.4.0
info: BugTracker set version: 0.4.0
connect.multipart() will be removed in connect 3.0
visit https://github.com/senchalabs/connect/wiki/Connect-3.0 for alternatives
connect.limit() will be removed in connect 3.0
2013-10-24T18:54:18.810Z - info: socket.io started
Browse to http://localhost:8448/#/repository?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com
Took 756ms to start server.
2013-10-24T18:54:18.811Z - info: Listening on port 8448
## Ungit started ##
2013-10-24T18:54:19.197Z - info: GET /
2013-10-24T18:54:19.267Z - info: GET /css/styles.css
2013-10-24T18:54:19.269Z - info: GET /serverdata.js
2013-10-24T18:54:19.269Z - info: GET /js/bugsense.js
2013-10-24T18:54:19.282Z - info: GET /js/ungit.js
2013-10-24T18:54:20.477Z - info: handshake authorized FvwO9hj6hyX11hXG0Ta7
2013-10-24T18:54:20.677Z - info: GET /images/logo.png
2013-10-24T18:54:20.681Z - info: GET /api/latestversion
2013-10-24T18:54:20.866Z - info: GET /api/quickstatus?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:20.902Z - info: Start watching /Users/austinrivas/Workspace/austinrivas/austinrivas.meteor.com
2013-10-24T18:54:20.904Z - info: GET /api/status?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:20.905Z - info: GET /api/log?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&limit=25&socketId=0
2013-10-24T18:54:20.905Z - info: GET /api/checkout?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:20.907Z - info: GET /api/remotes?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:20.996Z - info: GET /api/remote/tags?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&remote=origin&socketId=0
2013-10-24T18:54:20.996Z - info: POST /api/fetch
info: BugTracker set version: 0.4.0
connect.multipart() will be removed in connect 3.0
visit https://github.com/senchalabs/connect/wiki/Connect-3.0 for alternatives
connect.limit() will be removed in connect 3.0
2013-10-24T18:54:22.263Z - info: socket.io started
2013-10-24T18:54:22.264Z - info: Listening on port 8448
## Ungit started ##
2013-10-24T18:54:22.334Z - info: handshake authorized TqSgXZDQzqjv2Y2k0UQ4
2013-10-24T18:54:22.350Z - info: GET /images/logo.png
2013-10-24T18:54:22.356Z - info: GET /api/latestversion
2013-10-24T18:54:22.648Z - info: GET /api/quickstatus?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:22.779Z - info: Start watching /Users/austinrivas/Workspace/austinrivas/austinrivas.meteor.com
2013-10-24T18:54:22.781Z - info: GET /api/status?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:22.782Z - info: GET /api/log?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&limit=25&socketId=0
2013-10-24T18:54:22.783Z - info: GET /api/checkout?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:22.787Z - info: GET /api/remotes?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:22.875Z - info: POST /api/fetch
2013-10-24T18:54:22.880Z - info: GET /api/remote/tags?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&remote=origin&socketId=0
Stopped keeping ungit aliveHm can you paste the browsers console output?
On 24 Oct 2013 20:57, "Austin Rivas" notifications@github.com wrote:
I tried uninstalling ungit and reinstalling, but now ungit can't even
start up.It will connect initially, start the browser, then lose the connection
twice before stopping al together.Here is the console output :
austinrivas@Austins-MacBook-Pro austinrivas.meteor.com (master) $ ungit
info: BugTracker set version: 0.4.0
info: BugTracker set version: 0.4.0
connect.multipart() will be removed in connect 3.0
visit https://github.com/senchalabs/connect/wiki/Connect-3.0 for alternatives
connect.limit() will be removed in connect 3.0
2013-10-24T18:54:18.810Z - info: socket.io started
Browse to http://localhost:8448/#/repository?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com
Took 756ms to start server.
2013-10-24T18:54:18.811Z - info: Listening on port 8448Ungit started
2013-10-24T18:54:19.197Z - info: GET /
2013-10-24T18:54:19.267Z - info: GET /css/styles.css
2013-10-24T18:54:19.269Z - info: GET /serverdata.js
2013-10-24T18:54:19.269Z - info: GET /js/bugsense.js
2013-10-24T18:54:19.282Z - info: GET /js/ungit.js
2013-10-24T18:54:20.477Z - info: handshake authorized FvwO9hj6hyX11hXG0Ta7
2013-10-24T18:54:20.677Z - info: GET /images/logo.png
2013-10-24T18:54:20.681Z - info: GET /api/latestversion
2013-10-24T18:54:20.866Z - info: GET /api/quickstatus?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:20.902Z - info: Start watching /Users/austinrivas/Workspace/austinrivas/austinrivas.meteor.com
2013-10-24T18:54:20.904Z - info: GET /api/status?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:20.905Z - info: GET /api/log?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&limit=25&socketId=0
2013-10-24T18:54:20.905Z - info: GET /api/checkout?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:20.907Z - info: GET /api/remotes?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:20.996Z - info: GET /api/remote/tags?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&remote=origin&socketId=0
2013-10-24T18:54:20.996Z - info: POST /api/fetch
info: BugTracker set version: 0.4.0
connect.multipart() will be removed in connect 3.0
visit https://github.com/senchalabs/connect/wiki/Connect-3.0 for alternatives
connect.limit() will be removed in connect 3.0
2013-10-24T18:54:22.263Z - info: socket.io started
2013-10-24T18:54:22.264Z - info: Listening on port 8448Ungit started
2013-10-24T18:54:22.334Z - info: handshake authorized TqSgXZDQzqjv2Y2k0UQ4
2013-10-24T18:54:22.350Z - info: GET /images/logo.png
2013-10-24T18:54:22.356Z - info: GET /api/latestversion
2013-10-24T18:54:22.648Z - info: GET /api/quickstatus?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:22.779Z - info: Start watching /Users/austinrivas/Workspace/austinrivas/austinrivas.meteor.com
2013-10-24T18:54:22.781Z - info: GET /api/status?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:22.782Z - info: GET /api/log?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&limit=25&socketId=0
2013-10-24T18:54:22.783Z - info: GET /api/checkout?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:22.787Z - info: GET /api/remotes?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&socketId=0
2013-10-24T18:54:22.875Z - info: POST /api/fetch
2013-10-24T18:54:22.880Z - info: GET /api/remote/tags?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&remote=origin&socketId=0
Stopped keeping ungit alive—
Reply to this email directly or view it on GitHubhttps://github.com//issues/249#issuecomment-27020003
.
Google Chrome console output :
Viewport argument key "" not recognized and ignored. (index):5
App version: 0.4.0 (index):646
Initing bugtracking (index):648
Failed to load resource http://localhost:8448/api/fetch
Failed to load resource http://localhost:8448/api/remote/tags?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&remote=origin&socketId=0
Failed to load resource http://localhost:8448/api/latestversion
Failed to load resource http://localhost:8448/api/latestversion
Failed to load resource http://localhost:8448/api/fetch
Failed to load resource http://localhost:8448/api/remote/tags?path=%2FUsers%2Faustinrivas%2FWorkspace%2Faustinrivas%2Faustinrivas.meteor.com&remote=origin&socketId=0
Failed to load resource http://localhost:8448/socket.io/1/?t=1382642314531
Failed to load resource http://localhost:8448/socket.io/1/?t=1382642315533
GET http://localhost:8448/socket.io/1/?t=1382642317569 socket.io.js:1659
GET http://localhost:8448/socket.io/1/?t=1382642321572 socket.io.js:1659
GET http://localhost:8448/socket.io/1/?t=1382642329575 socket.io.js:1659
Everything works here so it's a bit hard to debug.
It looks like the server crashes, but for some reason it's not outputting a stacktrace.
Can you paste your ~/.ungitrc if you have one? Also which node --version and npm --version are you running?
A random guess would be (since it seems to run for a while) that it's something with the fetching. You can turn it off by starting ungit with ungit --no-autoFetch or setting "autoFetch": false, in your ~/.ungitrc and see if it helps.
Was able to fix the issue by upgrading node and npm after upgrading OS X to Maverick.
Everything is working fine now, Maverick was the problem.
Cool, closing