Home » Eclipse Projects » Eclipse Platform » CVS merge - Root Version Tag
| CVS merge - Root Version Tag [message #248343] |
Wed, 02 June 2004 08:08  |
Eclipse User |
|
|
|
Originally posted by: bob.news.gmx.net
Hi all,
when doing a CVS merge Eclipse needs the tag of the root version where the
branch originated. While this is not a problem if branching has been done
via Eclipse, obviously this tag is absent if it has been done with some
other tool. I can understand that it's a nice feature to have, to select
this by hand, so we can make arbitrary three way merges. But why is there
no feature to figure the version automatically. Other tools do it that
way AFAIK.
Is there any inherent reason why this does not work / is a bad idea(TM)?
Thanks for some enlightenment!
Kind regards
robert
|
|
|
| Re: CVS merge - Root Version Tag [message #248487 is a reply to message #248343] |
Wed, 02 June 2004 14:57  |
| Eclipse User |
|
|
|
Hi Robert,
You should always tag the starting point when merging. It is a well
known CVS best-pratice, but of course, isn't enforced by the tool. If
you did branch with the command line, then the current workaround for
Eclipse's lack of one tag merges, is to use the command line to perform
the merge.
Here is some background - the eclipse cvs client tries to show a preview
of the merge ahread of time. Having both the start and end tags provided
the best way for supporting multiple merges and calculating the preview.
If we only had one tag, as a client, it's hard to calculate the base
revisions for all files in the branch. When you run update -r tag, the
server does this for you and is better at figuring this out.
One possibility is to allow a merge via the new CVS update wizard. You
would pick a tag and then instead of a vanilla update it would merge
instead.
I've logged a bug for this:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=65420
Cheers,
Jean-Michel
Robert Klemme wrote:
> Hi all,
>
> when doing a CVS merge Eclipse needs the tag of the root version where the
> branch originated. While this is not a problem if branching has been done
> via Eclipse, obviously this tag is absent if it has been done with some
> other tool. I can understand that it's a nice feature to have, to select
> this by hand, so we can make arbitrary three way merges. But why is there
> no feature to figure the version automatically. Other tools do it that
> way AFAIK.
>
> Is there any inherent reason why this does not work / is a bad idea(TM)?
> Thanks for some enlightenment!
>
> Kind regards
>
> robert
>
|
|
|
| Re: CVS merge - Root Version Tag [message #248699 is a reply to message #248487] |
Thu, 03 June 2004 03:58 |
| Eclipse User |
|
|
|
Originally posted by: bob.news.gmx.net
"Jean-Michel Lemieux" <jean-michel_lemieux@ca.ibm.com> schrieb im
Newsbeitrag news:c9l7fp$q2b$1@eclipse.org...
> Hi Robert,
> You should always tag the starting point when merging. It is a well
> known CVS best-pratice, but of course, isn't enforced by the tool. If
> you did branch with the command line, then the current workaround for
> Eclipse's lack of one tag merges, is to use the command line to perform
> the merge.
Well, I wouldn't like to - with a tool like Eclipse, CVS command line
looks really clumsy. In that case I'd prefer to set the tag afterwards so
I can use Eclipse for merging.
> Here is some background - the eclipse cvs client tries to show a preview
> of the merge ahread of time. Having both the start and end tags provided
> the best way for supporting multiple merges and calculating the preview.
> If we only had one tag, as a client, it's hard to calculate the base
> revisions for all files in the branch.
In order to set the tag I needed to emulate this calculation. I did a
little scripting that uses "cvs -N -S log -r<my branch> | egrep '^date:' |
sort" to extract all dates on the branch to find the oldest date on the
branch. After that I tagged all versions on the branch my branch did
originate from using the timestamp minus a second. Not nice and not fast,
but maybe you can add such a feature as a Wizard to Eclipse. I'm sure
that will help people a lot that work on projects that did their CVS
without Eclipse.
Would you mind if I record this as a feature request in bugzilla?
> When you run update -r tag, the
> server does this for you and is better at figuring this out.
Yeah, and it's most likely faster.
> One possibility is to allow a merge via the new CVS update wizard. You
> would pick a tag and then instead of a vanilla update it would merge
> instead.
>
> I've logged a bug for this:
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=65420
Ok, thanks!
Kind regards
robert
> Cheers,
> Jean-Michel
>
> Robert Klemme wrote:
> > Hi all,
> >
> > when doing a CVS merge Eclipse needs the tag of the root version where
the
> > branch originated. While this is not a problem if branching has been
done
> > via Eclipse, obviously this tag is absent if it has been done with
some
> > other tool. I can understand that it's a nice feature to have, to
select
> > this by hand, so we can make arbitrary three way merges. But why is
there
> > no feature to figure the version automatically. Other tools do it
that
> > way AFAIK.
> >
> > Is there any inherent reason why this does not work / is a bad
idea(TM)?
> > Thanks for some enlightenment!
> >
> > Kind regards
> >
> > robert
> >
>
|
|
|
| Re: CVS merge - Root Version Tag [message #248726 is a reply to message #248699] |
Thu, 03 June 2004 06:28 |
| Eclipse User |
|
|
|
Robert Klemme wrote:
> "Jean-Michel Lemieux" <jean-michel_lemieux@ca.ibm.com> schrieb im
> Newsbeitrag news:c9l7fp$q2b$1@eclipse.org...
>
>>Hi Robert,
>>You should always tag the starting point when merging. It is a well
>>known CVS best-pratice, but of course, isn't enforced by the tool. If
>>you did branch with the command line, then the current workaround for
>>Eclipse's lack of one tag merges, is to use the command line to perform
>>the merge.
>
>
> Well, I wouldn't like to - with a tool like Eclipse, CVS command line
> looks really clumsy. In that case I'd prefer to set the tag afterwards so
> I can use Eclipse for merging.
Ack :) I could never use the command line again...
>>Here is some background - the eclipse cvs client tries to show a preview
>>of the merge ahread of time. Having both the start and end tags provided
>>the best way for supporting multiple merges and calculating the preview.
>> If we only had one tag, as a client, it's hard to calculate the base
>>revisions for all files in the branch.
>
>
> In order to set the tag I needed to emulate this calculation. I did a
> little scripting that uses "cvs -N -S log -r<my branch> | egrep '^date:' |
> sort" to extract all dates on the branch to find the oldest date on the
> branch. After that I tagged all versions on the branch my branch did
> originate from using the timestamp minus a second. Not nice and not fast,
> but maybe you can add such a feature as a Wizard to Eclipse. I'm sure
> that will help people a lot that work on projects that did their CVS
> without Eclipse.
>
> Would you mind if I record this as a feature request in bugzilla?
Yes we thought of this too, if we supported selecting a date as the
start tag this would work. Please enter a feature request for this. This
isn't high on our priority list so if you are keen and would like to
see this feature, please consider providing a patch.
>>When you run update -r tag, the
>>server does this for you and is better at figuring this out.
>
>
> Yeah, and it's most likely faster.
>
>
>>One possibility is to allow a merge via the new CVS update wizard. You
>>would pick a tag and then instead of a vanilla update it would merge
>>instead.
>>
>>I've logged a bug for this:
>>https://bugs.eclipse.org/bugs/show_bug.cgi?id=65420
>
>
> Ok, thanks!
>
> Kind regards
>
> robert
>
>
>
>>Cheers,
>>Jean-Michel
>>
>>Robert Klemme wrote:
>>
>>>Hi all,
>>>
>>>when doing a CVS merge Eclipse needs the tag of the root version where
>
> the
>
>>>branch originated. While this is not a problem if branching has been
>
> done
>
>>>via Eclipse, obviously this tag is absent if it has been done with
>
> some
>
>>>other tool. I can understand that it's a nice feature to have, to
>
> select
>
>>>this by hand, so we can make arbitrary three way merges. But why is
>
> there
>
>>>no feature to figure the version automatically. Other tools do it
>
> that
>
>>>way AFAIK.
>>>
>>>Is there any inherent reason why this does not work / is a bad
>
> idea(TM)?
>
>>>Thanks for some enlightenment!
>>>
>>>Kind regards
>>>
>>> robert
>>>
>>
>
|
|
|
| Re: CVS merge - Root Version Tag [message #248750 is a reply to message #248726] |
Thu, 03 June 2004 07:04 |
| Eclipse User |
|
|
|
Originally posted by: bob.news.gmx.net
"Jean-Michel Lemieux" <jean-michel_lemieux@ca.ibm.com> schrieb im
Newsbeitrag news:c9mu0n$qa7$1@eclipse.org...
> Robert Klemme wrote:
> > "Jean-Michel Lemieux" <jean-michel_lemieux@ca.ibm.com> schrieb im
> > Newsbeitrag news:c9l7fp$q2b$1@eclipse.org...
> >
Thanks for listening, Jean-Michel!
> > Well, I wouldn't like to - with a tool like Eclipse, CVS command line
> > looks really clumsy. In that case I'd prefer to set the tag
afterwards so
> > I can use Eclipse for merging.
>
> Ack :) I could never use the command line again...
Even WinCVS and JBuilder's CVS support are way behind Eclipse. You folks
did a really great Job here!
> > In order to set the tag I needed to emulate this calculation. I did a
> > little scripting that uses "cvs -N -S log -r<my branch> | egrep
'^date:' |
> > sort" to extract all dates on the branch to find the oldest date on
the
> > branch. After that I tagged all versions on the branch my branch did
> > originate from using the timestamp minus a second. Not nice and not
fast,
> > but maybe you can add such a feature as a Wizard to Eclipse. I'm sure
> > that will help people a lot that work on projects that did their CVS
> > without Eclipse.
> >
> > Would you mind if I record this as a feature request in bugzilla?
>
> Yes we thought of this too, if we supported selecting a date as the
> start tag this would work. Please enter a feature request for this. This
> isn't high on our priority list so if you are keen and would like to
> see this feature, please consider providing a patch.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=65520
I included the description from above also.
Kind regards
robert
|
|
|
Goto Forum:
Current Time: Wed Jul 16 12:40:32 EDT 2025
Powered by FUDForum. Page generated in 0.25995 seconds |
Home