| CVS merge problem [message #73291] |
Fri, 04 August 2006 13:59  |
Eclipse User |
|
|
|
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  |
| Eclipse User |
|
|
|
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 |
| Eclipse User |
|
|
|
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 |
 John Arthorne
Messages: 176
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
|
|
|
|
Powered by
FUDForum. Page generated in 0.03567 seconds
] 
Search
Help
Register
Login
Home
