Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Technology Project and PMC » CVS merge problem
CVS merge problem [message #73291] Fri, 04 August 2006 13:59 Go to next message
Eclipse UserFriend
Originally posted by: marx.nospam_wasko.pl

I did change in branch and in head on the same file.
I switch to HEAD and was trying to merge changes from branch into HEAD.
Eclipse switched to Synchronize View, showed red conflicts, hovewer I
couldn't expand tree with conflicted files.
It writes on the bottom bar that two files are conflicted, but it
doesn't show them in tree.
When i switch from conflicts to incoming mode it shows cross to expand
tree, but when I click it, cross disappears!
It seems like a bug, because it sometimes works ok - I can expand tree,
open diff view, make changes, save and mark as merged.
I tried it on Eclipse 3.2
Any help?

Marx
Re: CVS merge problem [message #73327 is a reply to message #73291] Thu, 10 August 2006 20:42 Go to previous messageGo to next message
Eclipse UserFriend
Originally posted by: john.eclipsefaq.org

Marx, you are asking these questions in the wrong newsgroup. The CVS
support is part of eclipse.platform. You'll probably get better luck
with answers there.
--

Marx wrote:
> I did change in branch and in head on the same file.
> I switch to HEAD and was trying to merge changes from branch into HEAD.
> Eclipse switched to Synchronize View, showed red conflicts, hovewer I
> couldn't expand tree with conflicted files.
> It writes on the bottom bar that two files are conflicted, but it
> doesn't show them in tree.
> When i switch from conflicts to incoming mode it shows cross to expand
> tree, but when I click it, cross disappears!
> It seems like a bug, because it sometimes works ok - I can expand tree,
> open diff view, make changes, save and mark as merged.
> I tried it on Eclipse 3.2
> Any help?
>
> Marx
Re: CVS merge problem [message #73345 is a reply to message #73327] Fri, 11 August 2006 06:00 Go to previous message
Eclipse UserFriend
Originally posted by: marx.nospam_wasko.pl

John Arthorne napisał(a):
> Marx, you are asking these questions in the wrong newsgroup. The CVS
> support is part of eclipse.platform. You'll probably get better luck
> with answers there.

Thank you, it was uncler for me which group is proper
Marx
Re: CVS merge problem [message #601003 is a reply to message #73291] Thu, 10 August 2006 20:42 Go to previous message
John Arthorne is currently offline John ArthorneFriend
Messages: 175
Registered: July 2009
Senior Member
Marx, you are asking these questions in the wrong newsgroup. The CVS
support is part of eclipse.platform. You'll probably get better luck
with answers there.
--

Marx wrote:
> I did change in branch and in head on the same file.
> I switch to HEAD and was trying to merge changes from branch into HEAD.
> Eclipse switched to Synchronize View, showed red conflicts, hovewer I
> couldn't expand tree with conflicted files.
> It writes on the bottom bar that two files are conflicted, but it
> doesn't show them in tree.
> When i switch from conflicts to incoming mode it shows cross to expand
> tree, but when I click it, cross disappears!
> It seems like a bug, because it sometimes works ok - I can expand tree,
> open diff view, make changes, save and mark as merged.
> I tried it on Eclipse 3.2
> Any help?
>
> Marx
Re: CVS merge problem [message #601010 is a reply to message #73327] Fri, 11 August 2006 06:00 Go to previous message
Marx is currently offline MarxFriend
Messages: 21
Registered: July 2009
Junior Member
John Arthorne napisał(a):
> Marx, you are asking these questions in the wrong newsgroup. The CVS
> support is part of eclipse.platform. You'll probably get better luck
> with answers there.

Thank you, it was uncler for me which group is proper
Marx
Previous Topic:Designing UI
Next Topic:Problem about User Feedback for Finished Jobs
Goto Forum:
  


Current Time: Sat Dec 20 16:47:35 GMT 2014

Powered by FUDForum. Page generated in 0.11196 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software