Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-dev] git sync 
Greg

1) Yes, we haven't yet written code to handle merge conflicts, which can be fairly involved. In the meantime, though, I agree that a dialog would be better.

2) Agreed. We will add some dialogs to handle these thrown exceptions.


Thank you for the feedback
John
___________________________________
From: ptp-dev-bounces@xxxxxxxxxxx [ptp-dev-bounces@xxxxxxxxxxx] On Behalf Of Greg Watson [g.watson@xxxxxxxxxxxx]
Sent: Monday, April 04, 2011 2:08 PM
To: Parallel Tools Platform general developers
Subject: [ptp-dev] git sync

Roland, John,

I was just trying out the git sync and encountered these problems:

1. When I created the sync project, I accidentally used a directory that already contained source. This resulted in the following message being repeatedly generated in the console. It should probably pop up a dialog to say there is a merge conflict and prevent a resync until the condition has been fixed.

sync failed:
org.eclipse.ptp.rdt.sync.git.core.RemoteSyncException:
        at org.eclipse.ptp.rdt.sync.git.core.GitRemoteSyncConnection.syncLocalToRemote(GitRemoteSyncConnection.java:567)
        at org.eclipse.ptp.rdt.sync.git.core.GitServiceProvider.synchronize(GitServiceProvider.java:229)
        at org.eclipse.ptp.internal.rdt.sync.core.ResourceChangeListener$SynchronizeJob.run(ResourceChangeListener.java:69)
        at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: org.eclipse.ptp.rdt.sync.git.core.RemoteExecutionException: Remote merge failed with message: You are in the middle of a conflicted merge.

        at org.eclipse.ptp.rdt.sync.git.core.GitRemoteSyncConnection.syncLocalToRemote(GitRemoteSyncConnection.java:568)
        ... 3 more


2. I then removed the directory on the remote machine and tried to sync again (by saving the editor). This time I got the following error (again in the console, but should be in a dialog at least):

sync failed:
org.eclipse.ptp.rdt.sync.git.core.RemoteSyncException:
        at org.eclipse.ptp.rdt.sync.git.core.GitRemoteSyncConnection.syncLocalToRemote(GitRemoteSyncConnection.java:550)
        at org.eclipse.ptp.rdt.sync.git.core.GitServiceProvider.synchronize(GitServiceProvider.java:229)
        at org.eclipse.ptp.internal.rdt.sync.core.ResourceChangeListener$SynchronizeJob.run(ResourceChangeListener.java:69)
        at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
Caused by: org.eclipse.jgit.errors.NoRemoteRepositoryException: ssh:///not/a/real/host/u/ac/grw/xxx: unable to chdir or not a git archive

        at org.eclipse.jgit.transport.TransportGitSsh.cleanNotFound(TransportGitSsh.java:194)
        at org.eclipse.jgit.transport.TransportGitSsh$SshPushConnection.<init>(TransportGitSsh.java:332)
        at org.eclipse.jgit.transport.TransportGitSsh.openPush(TransportGitSsh.java:152)
        at org.eclipse.jgit.transport.PushProcess.execute(PushProcess.java:130)
        at org.eclipse.jgit.transport.Transport.push(Transport.java:1120)
        at org.eclipse.ptp.rdt.sync.git.core.GitRemoteSyncConnection.syncLocalToRemote(GitRemoteSyncConnection.java:546)
        ... 3 more

_______________________________________________
ptp-dev mailing list
ptp-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-dev

Back to the top