Re: [Cs-studio-core] Yet another commit that screws up permissions

[Shroff, K. <sh...@bn...>]

Hello,

I just created a tutorial I am attaching the screenshots
I am using mercurialEclipse 1.7.1

While synchronizing with the remote repository I find it best to use the
synchronization perspective. I get to see all the local commits that
need to be pushed and the remote commits that need to be pulled.

A pull and update should update your local repo to head of the remote
branch.
Looking at the mercurial history graph confirms this.

You can use the history graph itself to do the merge, the graph tend to
make it very clear what is being merged with what.

Finally after the merge you can use the synchronize view again to push
your successfully merged repo back

kunal


-----Original Message-----
From: Carcassi, Gabriele 
Sent: Friday, February 25, 2011 9:41 AM
To: Kasemir, Kay; Shroff, Kunal
Subject: RE: [Cs-studio-core] Yet another commit that screws up
permissions

Hi Kay:

I don't use the integration. Kunal does, so he should be able to answer.

Gabriele

-----Original Message-----
From: Kasemir, Kay [mailto:kas...@or...] 
Sent: Friday, February 25, 2011 8:42 AM
To: Carcassi, Gabriele; Shroff, Kunal
Subject: Re: [Cs-studio-core] Yet another commit that screws up
permissions

On 2/23/11 09:52 , "Carcassi, Gabriele" <car...@bn...> wrote:
> A hint: when you merge, you should merge your changes _to_ the main
branch.
> So, on the command line: pull, update to latest revision in branch, 
> merge to your revision, commit, push.

Hello:

Do you know how to assert this sequence from within the Eclipse IDE?
Does it only work from the command line?

First of all, I always have to commit my changes, right?
I cannot merge when I have uncommitted local changes.
So from within the IDE, I get this:
commit any local changes,
pull,
... which is by default followed by an update, but that fails with a
'you need to merge' error, so you merge, which is automatically followed
by a commit "Merge with ABC1231231F...", push.

The pull, update that you suggest doesn't seem possible from within the
IDE because of the 'you need to merge' error.
Is that the problem?

Thanks,
Kay