Eclipse Community Forums: Eclipse Platform » Porbs with auto-merge of jsp's in eclipse CVS

Home » Eclipse Projects » Eclipse Platform » Porbs with auto-merge of jsp's in eclipse CVS

Porbs with auto-merge of jsp's in eclipse CVS [message #29764]

Mon, 12 May 2003 00:01

Eclipse User

Originally posted by: tim.b.rmt.com.au

I've been using eclipse for a while now and have generally had no problems
with the eclipse cvs merge capabilities. I have recently however been
getting more involved with jsp development in eclipse and have found that
the cvs 'update' command does not merge jsp's despite the fact that I have
set the jsp type to text/ascii (initially this was set to binary btw so we
did develop for a short time with content type binary for jsps).

We did a short test where we added a simple one liner to a jsp in two
completely different parts of the jsp and attempted to merge. No merge was
performed and I was simply presented with the .#[jsp-filename] file which
i had to merge manually. I can understand that complex merges may not work
but I have not been able to get even the simplest of merges working.

Does anyone know if there are any documented problems of this sort or have
a suggestion to what I may be doing wrong?

Thanks in advance

Tim

Re: Porbs with auto-merge of jsp's in eclipse CVS [message #29816 is a reply to message #29764]

Mon, 12 May 2003 10:16

Eclipse User

The only thing I can think of is that the file is actually still marked
as binary on the server. If the file was previously marked as binary you
will have to change the type on the server and not only in the file type
preferences:

1. select a project that contains your jsps.
2. Select Team > Change ASCII/Binary property

See the topic called "Setting the CVS keyword substitution mode" in the
docs for the complete set of steps.

Also, you may want to enable the CVS label decorator because it shows
the file type as known by the server.

Cheers,
Jean-Michel

Tim wrote:
> I've been using eclipse for a while now and have generally had no problems
> with the eclipse cvs merge capabilities. I have recently however been
> getting more involved with jsp development in eclipse and have found that
> the cvs 'update' command does not merge jsp's despite the fact that I have
> set the jsp type to text/ascii (initially this was set to binary btw so we
> did develop for a short time with content type binary for jsps).
>
> We did a short test where we added a simple one liner to a jsp in two
> completely different parts of the jsp and attempted to merge. No merge was
> performed and I was simply presented with the .#[jsp-filename] file which
> i had to merge manually. I can understand that complex merges may not work
> but I have not been able to get even the simplest of merges working.
>
> Does anyone know if there are any documented problems of this sort or have
> a suggestion to what I may be doing wrong?
>
> Thanks in advance
>
> Tim
>

Re: Porbs with auto-merge of jsp's in eclipse CVS [message #29857 is a reply to message #29816]

Mon, 12 May 2003 19:29

Eclipse User

Originally posted by: tim.b.rmt.com.au

Thanks.

I'll give that a go.

TIm

Jean-Michel Lemieux wrote:

> The only thing I can think of is that the file is actually still marked
> as binary on the server. If the file was previously marked as binary you
> will have to change the type on the server and not only in the file type
> preferences:

> 1. select a project that contains your jsps.
> 2. Select Team > Change ASCII/Binary property

> See the topic called "Setting the CVS keyword substitution mode" in the
> docs for the complete set of steps.

> Also, you may want to enable the CVS label decorator because it shows
> the file type as known by the server.

> Cheers,
> Jean-Michel

> Tim wrote:
> > I've been using eclipse for a while now and have generally had no problems
> > with the eclipse cvs merge capabilities. I have recently however been
> > getting more involved with jsp development in eclipse and have found that
> > the cvs 'update' command does not merge jsp's despite the fact that I have
> > set the jsp type to text/ascii (initially this was set to binary btw so we
> > did develop for a short time with content type binary for jsps).
> >
> > We did a short test where we added a simple one liner to a jsp in two
> > completely different parts of the jsp and attempted to merge. No merge was
> > performed and I was simply presented with the .#[jsp-filename] file which
> > i had to merge manually. I can understand that complex merges may not work
> > but I have not been able to get even the simplest of merges working.
> >
> > Does anyone know if there are any documented problems of this sort or have
> > a suggestion to what I may be doing wrong?
> >
> > Thanks in advance
> >
> > Tim
> >

Previous Topic:	Cocoon ant build
Next Topic:	Plugin conflict resolution and load order for product extensions

Goto Forum:

-=] Back to Top [=-

Current Time: Sun Jul 27 06:24:06 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter