Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 1364] New - Cannot commit after merge

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

[Issue 1364] New - Cannot commit after merge

Author hkdennis2k
Full name Dennis Cheung
Date 2012-01-19 00:51:19 PST
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1364
                 Issue #|1364
                 Summary|Cannot commit after merge
               Component|subclipse
                 Version|1.8.x
                Platform|JavaHL
              OS/Version|Windows XP
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|core
             Assigned to|issues@subclipse
             Reported by|hkdennis2k






------- Additional comments from hkdennis2k at tigris dot org Thu Jan 19 00:51:19 -0800 2012 -------
Cannot commit merged code in Eclipse.

I merged some coded from a branch, then patch few files in another folder(not in
ab\cd\ef but in ab\xy\z).
I tried to commit the code in eclipse but it send me to error.

I can commit the code by using svn in command line, without specified path
argument.


Message showned in SVN console
-----------
commit -m "my comment" -N (39 paths specified)
    Operation failed because an added parent is not selected.
    Illegal target for the requested operation
svn: Commit failed (details follow):
svn: 'R:\trunk\ab\cd\ef' is not under version control and is not part of the
commit, yet its child 'R:\trunk\ab\cd\ef\scripts' is part of the commit
-----------


Log found in .log
-----------
!ENTRY org.tigris.subversio​n.subclipse.core 4 -6 2012-01-19 16:42:12.942
!MESSAGE org.apache.subversio​n.javahl.ClientExcep​tion: Illegal target for the
requested operation
svn: Commit failed (details follow):
svn: 'R:\trunk\ab\cd\ef' is not under version control and is not part of the
commit, yet its child 'R:\trunk\ab\cd\ef\scripts' is part of the commit

!STACK 0
org.tigris.subversio​n.svnclientadapter.S​VNClientException:
org.apache.subversio​n.javahl.ClientExcep​tion: Illegal target for the requested
operation
svn: Commit failed (details follow):
svn: 'R:\trunk\ab\cd\ef' is not under version control and is not part of the
commit, yet its child 'R:\trunk\ab\cd\ef\scripts' is part of the commit

    at
org.tigris.subversio​n.svnclientadapter.j​avahl.AbstractJhlCli​entAdapter.commit(Ab​
stractJhlClientAdapt​er.java:344)
    at
org.tigris.subversio​n.subclipse.core.com​mands.CheckinResourc​esCommand$1.run(Che​c
kinResourcesCommand.java:126)
    at
org.tigris.subversio​n.subclipse.core.SVN​ProviderPlugin$5.ru​n(SVNProviderPlugin.​j
ava:503)
    at
org.eclipse.core.int​ernal.resources.Work​space.run(Workspace.​java:2344)
    at
org.eclipse.core.int​ernal.resources.Work​space.run(Workspace.​java:2326)
    at
org.tigris.subversio​n.subclipse.core.SVN​ProviderPlugin.run(S​VNProviderPlugin.jav​
a:498)
    at
org.tigris.subversio​n.subclipse.core.com​mands.CheckinResourc​esCommand.run(Checki​
nResourcesCommand.java:99)
    at
org.tigris.subversio​n.subclipse.core.SVN​TeamProvider.checkin​(SVNTeamProvider.jav​
a:139)
    at
org.tigris.subversio​n.subclipse.ui.opera​tions.CommitOperatio​n.execute(CommitOper​
ation.java:108)
    at
org.tigris.subversio​n.subclipse.ui.opera​tions.SVNOperation.r​un(SVNOperation.java​
:90)
    at
org.eclipse.team.int​ernal.ui.actions.Job​RunnableContext.run(​JobRunnableContext.j​
ava:144)
    at
org.eclipse.team.int​ernal.ui.actions.Job​RunnableContext$Res​ourceJob.runInWorksp​a
ce(JobRunnableContext.java:72)
    at
org.eclipse.core.int​ernal.resources.Inte​rnalWorkspaceJob.run​(InternalWorkspaceJo​
b.java:38)
    at org.eclipse.core.int​ernal.jobs.Worker.ru​n(Worker.java:54)
Caused by: org.apache.subversio​n.javahl.ClientExcep​tion: Illegal target for the
requested operation
svn: Commit failed (details follow):
svn: 'R:\trunk\ab\cd\ef' is not under version control and is not part of the
commit, yet its child 'R:\trunk\ab\cd\ef\scripts' is part of the commit

    at org.apache.subversio​n.javahl.SVNClient.c​ommit(Native Method)
    at
org.tigris.subversio​n.svnclientadapter.j​avahl.AbstractJhlCli​entAdapter.commit(Ab​
stractJhlClientAdapt​er.java:337)
    ... 13 more
-----------

« Previous message in topic | 1 of 2 | Next message in topic »

Messages

Show all messages in topic

Subject
+
Author
Full name
Date posted
[Issue 1364] New - Cannot commit after merge hkdennis2k Dennis Cheung 2012-01-19 00:51:19 PST
     [Issue 1364] Cannot commit after merge markphip Mark Phippard 2012-01-19 08:00:11 PST
Messages per page: