Similarly, the branch should be properly named.
[scott@js-macbookpro-24862 openmicroscopy (develop)]$ scc rebase 536 develop
# github.token and github.user not found.
# See `/usr/local/bin/scc token` for simpifying use.
Username or token: scottlittlewood
Enter password for http://github.com/scottlittlewood:
2013-01-18 11:44:07,285 [ scc.rebase] INFO PR 536: Insight import location opened by Scott Littlewood against dev_4_4
2013-01-18 11:44:07,286 [ scc.rebase] INFO Head: f8f2c5
2013-01-18 11:44:07,801 [ scc.rebase] INFO Merged: False
2013-01-18 11:44:08,904 [ scc.git] INFO Branching SHA1: 788eb8
2013-01-18 11:44:09,180 [ scc.git] INFO First, rewinding head to replay your work on top of it...
2013-01-18 11:44:15,019 [ scc.git] INFO Applying: Remove Import Location from Import Window and always show the Import Location PopUp on image selection
2013-01-18 11:44:15,120 [ scc.git] INFO Using index info to reconstruct a base tree...
2013-01-18 11:44:15,165 [ scc.git] INFO M components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/chooser/ImportDialog.java
2013-01-18 11:44:15,174 [ scc.git] INFO <stdin>:18: trailing whitespace.
2013-01-18 11:44:15,175 [ scc.git] INFO
2013-01-18 11:44:15,177 [ scc.git] INFO warning: 1 line adds whitespace errors.
2013-01-18 11:44:15,221 [ scc.git] INFO Falling back to patching base and 3-way merge...
2013-01-18 11:44:15,369 [ scc.git] INFO Auto-merging components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/chooser/ImportDialog.java
2013-01-18 11:44:15,654 [ scc.git] INFO Applying: Remove logic around showing location as popup as we always show it as a popup window now
2013-01-18 11:44:15,783 [ scc.git] INFO Applying: Refactor import location pane to be tab based
2013-01-18 11:44:15,912 [ scc.git] INFO Applying: Squash some refactor bugs
2013-01-18 11:44:16,139 [ scc.git] INFO Applying: Refactor UI related code for import location dialogue
2013-01-18 11:44:16,497 [ scc.git] INFO Applying: Location Dialog layout compiling
2013-01-18 11:44:16,924 [ scc.git] INFO Applying: More changes to the UI code
2013-01-18 11:44:17,061 [ scc.git] INFO Applying: Refactor in progress, NPEs at the moment, may need to revert and try again
2013-01-18 11:44:17,191 [ scc.git] INFO Applying: Start moving group code around
2013-01-18 11:44:17,330 [ scc.git] INFO Applying: Group refactor in progress
2013-01-18 11:44:17,360 [ scc.git] INFO Using index info to reconstruct a base tree...
2013-01-18 11:44:17,404 [ scc.git] INFO M components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/view/ImporterComponent.java
2013-01-18 11:44:17,413 [ scc.git] INFO <stdin>:151: trailing whitespace.
2013-01-18 11:44:17,413 [ scc.git] INFO * @param groupsBox
2013-01-18 11:44:17,413 [ scc.git] INFO <stdin>:166: trailing whitespace.
2013-01-18 11:44:17,413 [ scc.git] INFO
2013-01-18 11:44:17,413 [ scc.git] INFO <stdin>:177: trailing whitespace.
2013-01-18 11:44:17,413 [ scc.git] INFO
2013-01-18 11:44:17,413 [ scc.git] INFO <stdin>:243: trailing whitespace.
2013-01-18 11:44:17,413 [ scc.git] INFO
2013-01-18 11:44:17,413 [ scc.git] INFO <stdin>:249: trailing whitespace.
2013-01-18 11:44:17,414 [ scc.git] INFO
2013-01-18 11:44:17,416 [ scc.git] INFO warning: squelched 2 whitespace errors
2013-01-18 11:44:17,416 [ scc.git] INFO warning: 7 lines add whitespace errors.
2013-01-18 11:44:17,496 [ scc.git] INFO Falling back to patching base and 3-way merge...
2013-01-18 11:44:17,634 [ scc.git] INFO Auto-merging components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/view/ImporterComponent.java
2013-01-18 11:44:17,634 [ scc.git] INFO CONFLICT (content): Merge conflict in components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/view/ImporterComponent.java
2013-01-18 11:44:17,643 [ scc.git] INFO Failed to merge in the changes.
2013-01-18 11:44:17,651 [ scc.git] INFO Patch failed at 0010 Group refactor in progress
2013-01-18 11:44:17,651 [ scc.git] INFO
2013-01-18 11:44:17,651 [ scc.git] INFO When you have resolved this problem run "git rebase --continue".
2013-01-18 11:44:17,651 [ scc.git] INFO If you would prefer to skip this patch, instead run "git rebase --skip".
2013-01-18 11:44:17,651 [ scc.git] INFO To check out the original branch and stop rebasing run "git rebase --abort".
2013-01-18 11:44:17,651 [ scc.git] INFO
Traceback (most recent call last):
File "/usr/local/bin/scc", line 1383, in <module>
main()
File "/usr/local/bin/scc", line 1378, in main
ns.func(ns)
File "/usr/local/bin/scc", line 1161, in __call__
self.rebase(args, main_repo)
File "/usr/local/bin/scc", line 1188, in rebase
branching_sha1[0:6], pr_head)
File "/usr/local/bin/scc", line 725, in rebase
"%s" % newbase, "%s" % upstream, "%s" % sha1)
File "/usr/local/bin/scc", line 593, in call_info
return self.wrap_call(self.infoWrap, *command, **kwargs)
File "/usr/local/bin/scc", line 609, in wrap_call
raise Exception("rc=%s" % rc)
Exception: rc=1
[scott@js-macbookpro-24862 openmicroscopy ((ca363a7...)|REBASE)]$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/chooser/ImportDialog.java
# modified: components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/chooser/LocationDialog.java
# modified: components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/view/ImporterUI.java
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/view/ImporterComponent.java
#
[scott@js-macbookpro-24862 openmicroscopy ((ca363a7...)|REBASE)]$ git rebase --continue
components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/view/ImporterComponent.java: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
[scott@js-macbookpro-24862 openmicroscopy ((ca363a7...)|REBASE)]$ git add .
[scott@js-macbookpro-24862 openmicroscopy ((ca363a7...)|REBASE)]$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/chooser/ImportDialog.java
# modified: components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/chooser/LocationDialog.java
# modified: components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/view/ImporterComponent.java
# modified: components/insight/SRC/org/openmicroscopy/shoola/agents/fsimporter/view/ImporterUI.java
#
[scott@js-macbookpro-24862 openmicroscopy ((ca363a7...)|REBASE)]$ git rebase --continue
Applying: Group refactor in progress
Applying: Importer dialog now shows as groups are passed through
Applying: Loading Groups, projects & datasets into comboboxes, resolvec close button bug
Applying: Tab swap work in progress, need to wqork out hostObject type
Applying: Group switch in progress
Applying: Group change property fired
Applying: Group change property fired
Applying: Group switching in LcoationDialog now implemented and Project / Dataset updates
Applying: Code cleanup, remove unused irrelevant variables + code from group selection code
Applying: Import Settings classes defined, WIP
Applying: Improved jdocs for import settings
Applying: Fix buidl error
Applying: Resolve chaning of group issue in tree hierarchy
Applying: Improve the jdocs for the dialogs & refactor some of the code to be more readable
Applying: Started work on swapping tabs between Projects&Screens
Applying: Rewire the switching of groups & project -> screens. Reconnect the create project/dataset/screen event
Applying: Minor fixes
Applying: Add refresh button and address layout
Applying: More UI fixes, window size is better, added padding to LocationDialog
Applying: Change button variable names to be more explicit
Applying: Change combobox changes to be monitored through ItemLisener and not actionListener
Applying: Remove old actionlistener code paths, cleanup the actionPerformed function
Applying: Clear up tab switching to help isolate swapping groups & tabs bugs
Applying: Remove the file filter switching that occured in the chooser based on Project/Screen import
Applying: Remove unused code paths & cleanup code
Applying: More code cleanup
Applying: Improve the documentation, organisation & naming of variables/constants
Applying: Remove unused imports
Applying: Improve code organisation, limit line length, extract text constants
Applying: Reorganise string constants
Applying: Improve ImportDialog text constants & code
Applying: Remove unused code and reorganise for readability
Applying: Resolve showing Debug Tab pane issues
Applying: Code cleanup & string constant extraction
Applying: String constant extraction
Applying: Start of Advanced Panel with File Naming
Applying: Resolve compile issue & long / int cast exception on refresh button
Applying: Remove Advanced Import Location pane, Refactor TableLayouts to be more consistent, add some docs, more to come
Applying: Improve the javadocs
Applying: Remove unused variable
Applying: Re-add the refresh file chooser button, imrpove docs, remove buttons that have always been unused
Applying: Select the correct pane Screen/Project on Import
Applying: Fix the ordering of combobox items, cleanup some associated code
Applying: Move refresh buttons to buttom panel, doc tidy up, code cleanup
Applying: Remove unused index variable
Applying: Improve java docs for ImportSettings objects and change method visibility modifiers
Applying: Remove unused code
Applying: Move the refresh buttons
Applying: Move the Close and Refresh buttons on ImportDialog to be consistant with LocationDialog
Applying: Add enable/disable controls while loading or switching containers
Applying: Resolve spelling mistake in javadocs
Applying: Restore the active file filter on refresh
Applying: Refactor enable/disable code and add docs
Applying: Resolve compile issues
Applying: Minor Changes
Applying: Refactor findWithGroupId to be generic & start work on loading display data differently
Applying: Major refactor to improve code and legibility
Applying: Fixes issue with refresh button not loading the datasets, needed to call getDisplayChildren()
Applying: Implement retaining current selections when swapping tabs or refreshing
Applying: Remove old unused code & add java docs
Applying: Resolve line length issues & add missing javadocs
Applying: More javadoc issues resolved
Applying: Resolve user switching in Insight
Applying: Resolve the issue around switching user when running Importer as master agent
Applying: Remove unused import in ImporterAgent
Applying: Set enabled flag when switching group.
Applying: Add Discard to state check of model before clearing up
Applying: Clear up imports
Applying: Clear up Importer Menu in Window menu option on switching user
Applying: Add javadoc to loadGroups()
Applying: Remove old commented out code
Applying: Type check error
[scott@js-macbookpro-24862 openmicroscopy ((963a3ae...))]$ git status
# Not currently on any branch.
nothing to commit (working directory clean)