Stephen,
You were right. Both seem to die right after resolving a conflict in a property (svn:ignore).
Eclipse/Subclipse (from commmand line) terminates with just this:
Out of memory - terminating application.
CLI gives:
jamie@icf109118-ubuntu:~/Desktop/eclipse_4.2$ svn merge -r 38134:38518 https://myrepo/svn/myroot/myproject/branches/CPD-1506_JAJ /home/jamie/workspace4.2/myproject_merge
--- Merging r38135 through r38518 into '/home/jamie/workspace4.2/myproject_merge/wwwroot/plugins/askaquestion':
U /home/jamie/workspace4.2/myproject_merge/wwwroot/plugins/askaquestion/model/services/QuestionSearchService.cfc
Conflict discovered in '/home/jamie/workspace4.2/myproject_merge/wwwroot/plugins/askaquestion/internal/controllers/search.cfc'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: mc
U /home/jamie/workspace4.2/myproject_merge/wwwroot/plugins/askaquestion/internal/controllers/search.cfc
Conflict discovered in '/home/jamie/workspace4.2/myproject_merge/wwwroot/plugins/askaquestion/internal/views/search/default_solr.cfm'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: mc
U /home/jamie/workspace4.2/myproject_merge/wwwroot/plugins/askaquestion/internal/views/search/default_solr.cfm
G /home/jamie/workspace4.2/myproject_merge/wwwroot/plugins/askaquestion
--- Merging r38135 through r38518 into '/home/jamie/workspace4.2/myproject_merge':
U /home/jamie/workspace4.2/myproject_merge/wwwroot/plugins
U /home/jamie/workspace4.2/myproject_merge/wwwroot/requirements/solrj/cfsolrlib/cfsolrlib.cfc
Conflict for property 'svn:ignore' discovered on '/home/jamie/workspace4.2/myproject_merge'.
Select: (p) postpone, (df) diff-full, (e) edit,
(s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(s) show all options: r
Out of memory - terminating application.
Aborted (core dumped)
Where do I go from here? Do something different with my memory settings? File an upstream (SVN CLI) ticket? Request an enhancement for Subclipse to tolerate such a fault better?
In the meantime, I probably have to grab another version of the client to accomplish this merge.
Thanks,
Jamie
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3059269
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2013-06-27 16:54:55 CEST