Eclipse Community Forums: Java Development Tools (JDT) » Confusing CVS operations; restore and merge

Home

Home » Language IDEs » Java Development Tools (JDT) » Confusing CVS operations; restore and merge

Confusing CVS operations; restore and merge [message #19133]

Sun, 11 May 2003 02:22

Eclipse User

Originally posted by: if.you.want.to.email.visit.my.site.joshbrain.tripod.com

I do not understand how to properly do two CVS operations:
1 - reverse a local deletion (without using 'restore from local history')
2 - resolve a conflicting update in the 'sync' view.

In the first case I keep expecting something like "Restore Deleted" on the
package/folder node context menu. Maybe thats all "Restore from Local
History" really means, but it could be clearer IMHO.

In the second case, there are buttons to copy sections between the two
sides of the diff, but it isn't clear how this all works (with or without
'mark as merged'). What I would like to do is see that there is a conflict,
choose which version I want to work with (either the incoming one or my
current one), make the edits in that, and then have those edits save. Often
my edits don't save even in the pane that represents my local copy - that
is very frustrating! (And this is even when I've right-clicked on the local
copy and clicked "save").

Is there some sort of FAQ or mini-howto about Eclipse's CVS support,
especially it's merge support? thanks.

--
With kind regards,
Josh R.

Re: Confusing CVS operations; restore and merge [message #19285 is a reply to message #19133]

Sun, 11 May 2003 15:28

Eclipse User

Originally posted by: if.you.want.to.email.visit.my.site.joshbrain.tripod.com

Josh Rehman <if.you.want.to.email@visit.my.site.joshbrain.tripod.com> wrote
in news:Xns9377EEF821B15javajoshusenet@204.138.98.10:

> Is there some sort of FAQ or mini-howto about Eclipse's CVS support,
> especially it's merge support? thanks.

BTW overall the CVS support is wonderful! I'm sure I'm just being dense
about these two particular operations.

--
With kind regards,
Josh R.

Re: Confusing CVS operations; restore and merge [message #19601 is a reply to message #19133]

Mon, 12 May 2003 04:24

Eclipse User

Originally posted by: bob.news.gmx.net

"Josh Rehman" <if.you.want.to.email@visit.my.site.joshbrain.tripod.com>
schrieb im Newsbeitrag
news:Xns9377EEF821B15javajoshusenet@204.138.98.10...
> I do not understand how to properly do two CVS operations:
> 1 - reverse a local deletion (without using 'restore from local
history')
> 2 - resolve a conflicting update in the 'sync' view.
>
> In the first case I keep expecting something like "Restore Deleted" on
the
> package/folder node context menu. Maybe thats all "Restore from Local
> History" really means, but it could be clearer IMHO.

No. You do "Team -> Restore from Repository". This will show you deleted
files you can then restore.

> In the second case, there are buttons to copy sections between the two
> sides of the diff, but it isn't clear how this all works (with or
without
> 'mark as merged'). What I would like to do is see that there is a
conflict,
> choose which version I want to work with (either the incoming one or my
> current one), make the edits in that, and then have those edits save.
Often
> my edits don't save even in the pane that represents my local copy -
that
> is very frustrating! (And this is even when I've right-clicked on the
local
> copy and clicked "save").

Case 1 - You want to get the version from the repository: You click on the
<=> arrow ("Incoming / Outgoing mode"). You can then do "override and
update" on the context menu of a resource. (Could be that this works in
the show only conflicts view also.)

Case 2 - you want to keep your version or make selective changes: Copy
single changes or directly edit your version of the file and then save it
and mark is as merged. (From memory, can't test at the moment since I
have no conficts here.)

Regards

robert

Re: Confusing CVS operations; restore and merge [message #20725 is a reply to message #19601]

Tue, 13 May 2003 03:50

Eclipse User

Originally posted by: if.you.want.to.email.visit.my.site.joshbrain.tripod.com

"Robert Klemme" <bob.news@gmx.net> wrote in
news:b9nlur$ao9$1@rogue.oti.com:

> Case 1 - You want to get the version from the repository: You click on
> the <=> arrow ("Incoming / Outgoing mode"). You can then do "override
> and update" on the context menu of a resource. (Could be that this
> works in the show only conflicts view also.)

Hmm, but this would completely override my local copy, no? What I would
like would be to copy say 1 or 2 things from local onto the repository
copy, and then "Override and Update". Does that make sense?

>
> Case 2 - you want to keep your version or make selective changes: Copy
> single changes or directly edit your version of the file and then save
> it and mark is as merged. (From memory, can't test at the moment
> since I have no conficts here.)

I swear I've tried that before, and it just ate my merges. I'll try it
again though.

Thank you kindly for your help, Robert.

--
With kind regards,
Josh R.

Re: Confusing CVS operations; restore and merge [message #20775 is a reply to message #20725]

Tue, 13 May 2003 04:51

Eclipse User

Originally posted by: bob.news.gmx.net

"Josh Rehman" <if.you.want.to.email@visit.my.site.joshbrain.tripod.com>
schrieb im Newsbeitrag news:Xns937A9A85E796javajoshusenet@204.138.98.10...
> "Robert Klemme" <bob.news@gmx.net> wrote in
> news:b9nlur$ao9$1@rogue.oti.com:
>
> > Case 1 - You want to get the version from the repository: You click on
> > the <=> arrow ("Incoming / Outgoing mode"). You can then do "override
> > and update" on the context menu of a resource. (Could be that this
> > works in the show only conflicts view also.)
>
> Hmm, but this would completely override my local copy, no?

As I said.

> What I would
> like would be to copy say 1 or 2 things from local onto the repository
> copy, and then "Override and Update". Does that make sense?

This is case 2.

> > Case 2 - you want to keep your version or make selective changes: Copy
> > single changes or directly edit your version of the file and then save
> > it and mark is as merged. (From memory, can't test at the moment
> > since I have no conficts here.)
>
> I swear I've tried that before, and it just ate my merges. I'll try it
> again though.

Could be that after going through all files and dealing with individual
conflicts you have to do an update or so from the synchronize view. I
can't remember since it's quite a while that I did an extensive merge.
But there definitely is a way to do it.

> Thank you kindly for your help, Robert.

You're welcome.

Regards

robert

Previous Topic:	Error opening external editor
Next Topic:	workaround for bug #36283?

Goto Forum:

-=] Back to Top [=-

Current Time: Thu May 01 19:24:40 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter