Instead of "2<&1" there must be "2>&1" when redirecting the streams. turbo_sync7
authormentlicher@netbeans.org
Fri, 12 Nov 2004 11:24:58 +0000
changeset 5417c9e2c21a2169
parent 5416 4dec5f4a104f
child 5418 e2203f90f44e
Instead of "2<&1" there must be "2>&1" when redirecting the streams.
Also, the "./" is cut in paths reported by update.
This is a fix of issue #51447.
vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml
vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/visualizers/update/CvsUpdateVisualizer.java
     1.1 --- a/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml	Thu Nov 11 12:58:07 2004 +0000
     1.2 +++ b/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvs.xml	Fri Nov 12 11:24:58 2004 +0000
     1.3 @@ -853,7 +853,7 @@
     1.4        <command name="UPDATE_CMD" >
     1.5  	<property name="exec">
     1.6  	  <value if="IS_CMD-LINE_AND_WINDOWS">${CDM_EXECUTE} ${USER_GLOBAL_PARAM} update ${PRUNE_EMPTY} ${CREATE_DIRS} ${GET_CLEAN_COPY} ${SEND_TO_STDOUT} $[? RESET_STICKY] [${RESET_STICKY}] [$[? TAG] [-r ${TAG}] [] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] []] $[? MERGE_SELECTION] [$[? MERGE_SELECTION - 1] [-j ${MERGE_REV1} -j ${MERGE_REV2}] [-j ${MERGE_REV}]] [] ${FORCE_HEAD_MATCH} ${RCS_KFLAG}  ${RECURSIVE} $[? DIR] [${QPATHS}] [$[? FILE] [${QPATHS}] []] ${NUR}</value>
     1.7 -	  <value>${CDM_EXECUTE} ${USER_GLOBAL_PARAM} update ${PRUNE_EMPTY} ${CREATE_DIRS} ${GET_CLEAN_COPY} ${SEND_TO_STDOUT} $[? RESET_STICKY] [${RESET_STICKY}] [$[? TAG] [-r ${TAG}] [] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] []] $[? MERGE_SELECTION] [$[? MERGE_SELECTION - 1] [-j ${MERGE_REV1} -j ${MERGE_REV2}] [-j ${MERGE_REV}]] [] ${FORCE_HEAD_MATCH} ${RCS_KFLAG}  ${RECURSIVE} $[? DIR] [${QPATHS}] [$[? FILE] [${QPATHS}] []] 2&lt;&amp;1 ${NUR}</value>
     1.8 +	  <value>${CDM_EXECUTE} ${USER_GLOBAL_PARAM} update ${PRUNE_EMPTY} ${CREATE_DIRS} ${GET_CLEAN_COPY} ${SEND_TO_STDOUT} $[? RESET_STICKY] [${RESET_STICKY}] [$[? TAG] [-r ${TAG}] [] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] []] $[? MERGE_SELECTION] [$[? MERGE_SELECTION - 1] [-j ${MERGE_REV1} -j ${MERGE_REV2}] [-j ${MERGE_REV}]] [] ${FORCE_HEAD_MATCH} ${RCS_KFLAG}  ${RECURSIVE} $[? DIR] [${QPATHS}] [$[? FILE] [${QPATHS}] []] 2&gt;&amp;1 ${NUR}</value>
     1.9  	</property>
    1.10  	<property name="data.regex">
    1.11  	  <value>^([UPARMC]) (.*$)|^(.*) (already contains the differences)(.*)$</value>
    1.12 @@ -1681,7 +1681,7 @@
    1.13        <command name="CHECKOUT_COMMAND">
    1.14  	<property name="exec">
    1.15  	  <value if="IS_CMD-LINE_AND_WINDOWS">${EXECUTE} ${USER_GLOBAL_PARAM} checkout ${FORCE_HEAD_MATCH} ${DO_NOT_SHORTEN} ${SEND_TO_STDOUT} ${RCS_KFLAG} ${RUN_MODULE_PROGRAM} $[? DIRECTORY] [-d ${DIRECTORY}] [] $[? RESET_STICKY] [${RESET_STICKY}] [$[? TAG] [-r ${TAG}] [] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] []] ${PRUNE_EMPTY}  ${RECURSIVE} ${CO_MODULE} ${CO_ALL} ${NUR}</value>
    1.16 -	  <value>${EXECUTE} ${USER_GLOBAL_PARAM} checkout ${FORCE_HEAD_MATCH} ${DO_NOT_SHORTEN} ${SEND_TO_STDOUT} ${RCS_KFLAG} ${RUN_MODULE_PROGRAM} $[? DIRECTORY] [-d ${DIRECTORY}] [] $[? RESET_STICKY] [${RESET_STICKY}] [$[? TAG] [-r ${TAG}] [] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] []] ${PRUNE_EMPTY}  ${RECURSIVE} ${CO_MODULE} ${CO_ALL} 2&lt;&amp;1 ${NUR}</value>
    1.17 +	  <value>${EXECUTE} ${USER_GLOBAL_PARAM} checkout ${FORCE_HEAD_MATCH} ${DO_NOT_SHORTEN} ${SEND_TO_STDOUT} ${RCS_KFLAG} ${RUN_MODULE_PROGRAM} $[? DIRECTORY] [-d ${DIRECTORY}] [] $[? RESET_STICKY] [${RESET_STICKY}] [$[? TAG] [-r ${TAG}] [] $[? DATE] [-D ${QUOTE}${DATE}${QUOTE}] []] ${PRUNE_EMPTY}  ${RECURSIVE} ${CO_MODULE} ${CO_ALL} 2&gt;&amp;1 ${NUR}</value>
    1.18  	</property>
    1.19  	<property name="display">
    1.20  	  <value>true</value>
     2.1 --- a/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/visualizers/update/CvsUpdateVisualizer.java	Thu Nov 11 12:58:07 2004 +0000
     2.2 +++ b/vcs.profiles.cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/visualizers/update/CvsUpdateVisualizer.java	Fri Nov 12 11:24:58 2004 +0000
     2.3 @@ -226,6 +226,7 @@
     2.4                  if (paths[index].endsWith(part)) {
     2.5                      String path = paths[index] + name.substring(end);
     2.6                      if (path.startsWith("/")) path = path.substring(1);
     2.7 +                    if (path.startsWith("./")) path = path.substring(2);
     2.8                      bestMatch = new File(path);
     2.9                      wasMatch = true;
    2.10                  }