Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [ptp-user] What am I to do with the Synchronized Merge View
Hi Brian

I tried repeating what you did but did not receive a merge conflict. The deleted files are simply ignored. In your case, "resolve as remote" seems correct, since you wanted to preserve the remote files.

For unfiltered files, deleting the files locally should cause them to be deleted remotely. If filtered, though, these changes should not be propagated.

My guess is that the files were deleted during a sync, which somehow triggered the problem. If you can come up with some steps to reproduce the problem, please file a bug report.

It's expected that merge conflicts happen rarely and usually require carefully merging each file, in which case multiple selection is not very helpful. This is clearly not always the case, though, so
I agree that this capability should be added. Thanks for the suggestion!


John

On Tue, Aug 7, 2012 at 2:29 PM, Brian Watt <bwatt@xxxxxxxxxx> wrote:

Thanks John for the reply. I just read the material you mentioned.

So my list of files were only on the remote node (since I had manually deleted them on the local node) and were then being filtered because the root directory 'ship' was excluded. Also they were all binary files so I wouldn't want to the use the compare editor. So I thought that I could resolve the conflicts by using "mark as resolved" but that didn't work. Each time I tried to synch the same file reappeared in the conflict list. What selection should I have used since I basically wanted the conflict to be purged? Also I'd like to have a multiple selection capability so I could just say purge all of them.

Brian Watt, IBM

Inactive hide details for John Eblen ---08/07/2012 12:49:37 PM---Hi Glad to hear you resolved the problem. For future referenceJohn Eblen ---08/07/2012 12:49:37 PM---Hi Glad to hear you resolved the problem. For future reference, merge-conflict

From: John Eblen <jeblen@xxxxxxx>
To: PTP User list <ptp-user@xxxxxxxxxxx>,
Date: 08/07/2012 12:49 PM
Subject: Re: [ptp-user] What am I to do with the Synchronized Merge View
Sent by: ptp-user-bounces@xxxxxxxxxxx




Hi

Glad to hear you resolved the problem. For future reference, merge-conflict resolution is covered in the Eclipse help at Parallel Tools Platform (PTP) User Guide -> Synchronized Projects -> Resolving merge conflicts.

This discusses the meaning of the menu options.


John

On Tue, Aug 7, 2012 at 12:59 PM, Brian Watt <bwatt@xxxxxxxxxx> wrote:
    Nevermind, I used "I get a merge conflict for a file that changed both locally and remotely. How do I recover from this?" on URL http://wiki.eclipse.org/PTP/sync-projects, and deleted the two .ptp-sync directories to get back alive again.

    Brian Watt, IBM
    Inactive hide details for Brian Watt---08/07/2012 09:34:00 AM---So I'm setting up a synchronized project containing about 3800 Brian Watt---08/07/2012 09:34:00 AM---So I'm setting up a synchronized project containing about 3800 files. My local client is Linux and m

    From:     Brian Watt/Austin/IBM
    To:     "PTP User list" <ptp-user@xxxxxxxxxxx>,
    Date:     08/07/2012 09:34 AM
    Subject:     What am I to do with the Synchronized Merge View


    So I'm setting up a synchronized project containing about 3800 files. My local client is Linux and my remote host is Linux. I'm running the latest Eclipse PTP code from the nightly build.

    Initially I tried synching, but realized that I should have filtered out some of the root directories. So I added them to the filter after the fact. Next I deleted the local filtered replicated directories from my workspace manually using the command line, because I didn't want to use Eclipse just in case Eclipse would delete the remote directories. Now I'm getting Synchronization Error popup stating "Synchronization error for project: <project_name> Merge Conflict" and two buttons Open Merge Conflict View and OK. I selected Open Merge Conflict View and get a view with a number of files listed. Selecting on of the files I get a menu list with things like "Reset to version before merge", "Mark as resolved", and "Resolve as remote". Yet when I select any of these nothing seems to change in the view. Are these menu items documented somewhere? I now can't get synchronization to work without this error. I have tried to start and stop Eclipse, but that doesn't help. I'm frustrated and stuck.

    Also the Synchronized Merge View does not allow me to select multiple entries yet I have 76 individual files listed.

    Brian Watt, IBM

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


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


GIF image

Back to the top