This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 52145 - CVS: Badly displayed merge messages (err/out merging)
Summary: CVS: Badly displayed merge messages (err/out merging)
Status: RESOLVED FIXED
Alias: None
Product: obsolete
Classification: Unclassified
Component: vcsgeneric (show other bugs)
Version: 4.x
Hardware: PC Windows XP
: P3 blocker (vote)
Assignee: Martin Entlicher
URL:
Keywords:
Depends on: 35999
Blocks:
  Show dependency tree
 
Reported: 2004-12-07 10:13 UTC by Marek Fukala
Modified: 2005-03-14 17:00 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments
CVS update command log (1.49 KB, text/plain)
2004-12-07 10:13 UTC, Marek Fukala
Details
The ide screensthot (109.09 KB, text/plain)
2004-12-07 10:15 UTC, Marek Fukala
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Marek Fukala 2004-12-07 10:13:18 UTC
[nb4.0 beta 2 build, win XP]
After merging some sources from a branch to trunk
the cvs window showing a table with particullar
merged files do not show some file names and paths
(see attached screenshot). The text output of the
cvs command is also attached (it's correct).
Comment 1 Marek Fukala 2004-12-07 10:13:49 UTC
Created attachment 19169 [details]
CVS update command log
Comment 2 Marek Fukala 2004-12-07 10:15:02 UTC
Created attachment 19170 [details]
The ide screensthot
Comment 3 Marek Fukala 2004-12-07 10:27:11 UTC
Moreover, the merged files statuses was wrong after the update(merge).
All changed files had up-to-date status - I had to refresh the folder
and then the files appeared as locally modified. 
Comment 4 Martin Entlicher 2004-12-08 12:58:53 UTC
The problem seems to be that there are missing U or M responses for
the affected files. On Windows there is a problem that we can not take
the information from the error output, because it's not in synch with
standard output. The workaround that is used to guess the file path
does not seem to work in this case.
Comment 5 _ pkuzel 2005-01-12 15:10:33 UTC
On JRE 5.0 there is ProcessBuilder.redirectErrorStream(true). Let's
call it using reflection. Most users runs on JRE 5.0 anyway.
Comment 6 Martin Entlicher 2005-02-09 10:52:21 UTC
Fixed in trunk:

/cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml,v
 <--  cvs.xml
new revision: 1.142; previous revision: 1.141
done
Processing log script arguments...
More commits to come...
Checking in cvsprofiles/visualizers/update/CvsUpdateVisualizer.java;
/cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/visualizers/update/CvsUpdateVisualizer.java,v
 <--  CvsUpdateVisualizer.java
new revision: 1.21; previous revision: 1.20
done
Removing cvsprofiles/visualizers/update/CvsUpdateVisualizerStdOut.java;
/cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/visualizers/update/CvsUpdateVisualizerStdOut.java,v
 <--  CvsUpdateVisualizerStdOut.java
new revision: delete; previous revision: 1.6
Comment 7 Martin Entlicher 2005-03-04 19:50:36 UTC
It looks that this fix might not be reliable in all cases due to
unreliable merging of error streams. See issue #55594, issue #55958
and issue #35999.

Reopening, we'll likely need to rewrite that....
Comment 8 Martin Entlicher 2005-03-14 17:00:11 UTC
After issue #55958 was fixed, it should behave correctly with the built-in
client. If it does not get the Examining messages, it uses a workaround to guess
the file paths, so it should work O.K. in most cases now.