CVS -- Merge two revisions
Has anyone ever used CVS->update->Merge two revisions?
I have, in vain, tried in many netbeans versions to get CVS->update->Merge
two revisions to work on a filesystem level. I used to use netbeans, but am
starting to switch to Sun One Studio since we will need to other modules
soon. Anyway, in Sun One 4 merging gives output that appears correct in the
output window, but no files on my machine are actually changed. They do
show LMod though, but not after a refresh.
In this version, even using the Versioning explorer and does not work when
two versions are highlighted and I select "Merge Revision Differences". Has
anyone ever done this? I would think that the netbeans people would be
doing this all the time.
Tag some files, change some of those, tag again, and then merge the
differences. It just does not work. I have not filed a netbeans bug or a
Forte bug for this yet, because I have a hard time believing that this does
not work.
The files I am merging from are on a branch as well as the files I am
merging to
Filesystem settings:
Yes on backup files
No on Process all files
No on Offline mode
Update Settings
No on merge revision with current (my tag1 name is in this text field)
Yes on Merge two revisions (my tag2 name is in this text field)
(The bottom shows update -j tag1 -j tag2
Update Global Settings
Yes on gzip
No on Don't change files
No on suppress history
No on revision
Mark Claassen
Donnell Systems, Inc.
300 S. St. Louis Blvd. Ste. 203
South Bend, IN 46617
E-mail: mailto:mark.claassen@donnell.com
Voice: (574)232-3784
Fax: (574)232-4014
# 1
Is netbeans/Forte/Sun One Studio used to develop netbeans? If so, is
merging using two files something that happens internally on a fairly
regular basis or not? I am just trying to grasp if anyone else does this,
and if so, does it work for others?
Thanks,
Mark
> --Original Message--
> From: Mark Claassen [mailto:mac@donnell.com]
> Sent: Monday, July 15, 2002 1:48 PM
> To: users Netbeans
> Subject: CVS -- Merge two revisions
>
>
> Has anyone ever used CVS->update->Merge two revisions?
>
> I have, in vain, tried in many netbeans versions to get CVS->update->Merge
> two revisions to work on a filesystem level. I used to use
> netbeans, but am
> starting to switch to Sun One Studio since we will need to other modules
> soon. Anyway, in Sun One 4 merging gives output that appears
> correct in the
> output window, but no files on my machine are actually changed. They do
> show LMod though, but not after a refresh.
>
> In this version, even using the Versioning explorer and does not work when
> two versions are highlighted and I select "Merge Revision
> Differences". Has
> anyone ever done this? I would think that the netbeans people would be
> doing this all the time.
>
> Tag some files, change some of those, tag again, and then merge the
> differences. It just does not work. I have not filed a netbeans bug or a
> Forte bug for this yet, because I have a hard time believing that
> this does
> not work.
>
> The files I am merging from are on a branch as well as the files I am
> merging to
>
> Filesystem settings:
> Yes on backup files
> No on Process all files
> No on Offline mode
>
> Update Settings
> No on merge revision with current (my tag1 name is in this
> text field)
> Yes on Merge two revisions (my tag2 name is in this text field)
> (The bottom shows update -j tag1 -j tag2
>
> Update Global Settings
> Yes on gzip
> No on Don't change files
> No on suppress history
> No on revision
>
>
>
> Mark Claassen
> Donnell Systems, Inc.
> 300 S. St. Louis Blvd. Ste. 203
> South Bend, IN 46617
> E-mail: mailto:mark.claassen@donnell.com
> Voice: (574)232-3784
> Fax: (574)232-4014
>
# 2
Hi Mark,
I wanted to answer already to your former mail but was pretty busy. :-)
On the other hand I think I have good news for you because it works fine
except the status problems. If I understood you correctly, you should
just revert the order of your tags. Setup tag2 into the first textfield
and tag1 into the second one. This is how your CVS server needs it. The
same goes for "Merge Revision Differences" action in Versioning
explorer. It is necessary to select newer revision first.
Hope that helps.
Regards Jirka
Mark Claassen wrote:
>Is netbeans/Forte/Sun One Studio used to develop netbeans? If so, is
>merging using two files something that happens internally on a fairly
>regular basis or not? I am just trying to grasp if anyone else does this,
>and if so, does it work for others?
>
>Thanks,
>Mark
>
>>--Original Message--
>>From: Mark Claassen [mailto:mac@donnell.com]
>>Sent: Monday, July 15, 2002 1:48 PM
>>To: users Netbeans
>>Subject: CVS -- Merge two revisions
>>
>>
>>Has anyone ever used CVS->update->Merge two revisions?
>>
>>I have, in vain, tried in many netbeans versions to get CVS->update->Merge
>>two revisions to work on a filesystem level. I used to use
>>netbeans, but am
>>starting to switch to Sun One Studio since we will need to other modules
>>soon. Anyway, in Sun One 4 merging gives output that appears
>>correct in the
>>output window, but no files on my machine are actually changed. They do
>>show LMod though, but not after a refresh.
>>
>>In this version, even using the Versioning explorer and does not work when
>>two versions are highlighted and I select "Merge Revision
>>Differences". Has
>>anyone ever done this? I would think that the netbeans people would be
>>doing this all the time.
>>
>>Tag some files, change some of those, tag again, and then merge the
>>differences. It just does not work. I have not filed a netbeans bug or a
>>Forte bug for this yet, because I have a hard time believing that
>>this does
>>not work.
>>
>>The files I am merging from are on a branch as well as the files I am
>>merging to
>>
>>Filesystem settings:
>> Yes on backup files
>> No on Process all files
>> No on Offline mode
>>
>>Update Settings
>> No on merge revision with current (my tag1 name is in this
>>text field)
>> Yes on Merge two revisions (my tag2 name is in this text field)
>> (The bottom shows update -j tag1 -j tag2
>>
>>Update Global Settings
>> Yes on gzip
>> No on Don't change files
>> No on suppress history
>> No on revision
>>
>>
>>
>>Mark Claassen
>>Donnell Systems, Inc.
>>300 S. St. Louis Blvd. Ste. 203
>>South Bend, IN 46617
>>E-mail: mailto:mark.claassen@donnell.com
>>Voice: (574)232-3784
>>Fax: (574)232-4014
>>
# 3
Thanks for the reply!
I went ahead and used WinCVS to do my merge yesterday, so my test case is
ruined, but I will try another soon.
One question though, in Karl Fogel's CVS book, it says that the first -j
gives the "starting point" and the second -j is the end point. In his
example, he used the branch tag for the end and not another plain tag, but
it seems the concept still applies.
In the netbeans update command, the top textfield is the first -j and the
textfield beneath it is the second -j. At the bottom of the update dialog
it shows the command line, which shows the top text field being first and
the bottom one second. This seems to be the way Fogel describes the correct
syntax of the update command.
In WinCVS the command that showed in my output window yesterday was:
cvs update -d -C -jRELEASE_3_4_MERGE_08 -jRELEASE_3_4_MERGE_09
This is not what would show in my netbeans window if I did what you are
describing.
Are you saying it works both ways? or netbeans is just shows one thing and
does the other?
By the way. I just noticed that WinCVS included the "get clean copy" [-C]
which I did not select in netbeans.
Thanks for your time!
Mark
> --Original Message--
> From: Jiri Kovalsky [mailto:jiri.kovalsky@sun.com]
> Sent: Wednesday, July 17, 2002 4:21 AM
> To: nbusers@netbeans.org
> Subject: Re: CVS -- Merge two revisions
>
>
> Hi Mark,
> I wanted to answer already to your former mail but was pretty busy. :-)
> On the other hand I think I have good news for you because it works fine
> except the status problems. If I understood you correctly, you should
> just revert the order of your tags. Setup tag2 into the first textfield
> and tag1 into the second one. This is how your CVS server needs it. The
> same goes for "Merge Revision Differences" action in Versioning
> explorer. It is necessary to select newer revision first.
> Hope that helps.
> Regards Jirka
>
> Mark Claassen wrote:
>
> >Is netbeans/Forte/Sun One Studio used to develop netbeans? If so, is
> >merging using two files something that happens internally on a fairly
> >regular basis or not? I am just trying to grasp if anyone else
> does this,
> >and if so, does it work for others?
> >
> >Thanks,
> >Mark
> >
> >>--Original Message--
> >>From: Mark Claassen [mailto:mac@donnell.com]
> >>Sent: Monday, July 15, 2002 1:48 PM
> >>To: users Netbeans
> >>Subject: [nbusers] CVS -- Merge two revisions
> >>
> >>
> >>Has anyone ever used CVS->update->Merge two revisions?
> >>
> >>I have, in vain, tried in many netbeans versions to get
> CVS->update->Merge
> >>two revisions to work on a filesystem level. I used to use
> >>netbeans, but am
> >>starting to switch to Sun One Studio since we will need to other modules
> >>soon. Anyway, in Sun One 4 merging gives output that appears
> >>correct in the
> >>output window, but no files on my machine are actually changed. They do
> >>show LMod though, but not after a refresh.
> >>
> >>In this version, even using the Versioning explorer and does
> not work when
> >>two versions are highlighted and I select "Merge Revision
> >>Differences". Has
> >>anyone ever done this? I would think that the netbeans people would be
> >>doing this all the time.
> >>
> >>Tag some files, change some of those, tag again, and then merge the
> >>differences. It just does not work. I have not filed a
> netbeans bug or a
> >>Forte bug for this yet, because I have a hard time believing that
> >>this does
> >>not work.
> >>
> >>The files I am merging from are on a branch as well as the files I am
> >>merging to
> >>
> >>Filesystem settings:
> >> Yes on backup files
> >> No on Process all files
> >> No on Offline mode
> >>
> >>Update Settings
> >> No on merge revision with current (my tag1 name is in this
> >>text field)
> >> Yes on Merge two revisions (my tag2 name is in this text field)
> >> (The bottom shows update -j tag1 -j tag2
> >>
> >>Update Global Settings
> >> Yes on gzip
> >> No on Don't change files
> >> No on suppress history
> >> No on revision
> >>
> >>
> >>
> >>Mark Claassen
> >>Donnell Systems, Inc.
> >>300 S. St. Louis Blvd. Ste. 203
> >>South Bend, IN 46617
> >>E-mail: mailto:mark.claassen@donnell.com
> >>Voice: (574)232-3784
> >>Fax: (574)232-4014
> >>
>
