CVS conflict on switch branch

Dear all,
I am not an experienced CVS user so forgive me if the solution to the following problem is obvious...
I have created a branch of my project. I have then made some changes to both the source code in the branch and also the project itself. The project has been modified by adding a new logical folder and placing some files inside it. Now, when I attempt to switch back to the trunk I get error messages from CVS stating that there were some conflicts. The conflicts occur in files called .make.state.Debug and configurations.xml. These are presumably project files automatically generated by the IDE. Any ideas on how to resolve them? My project will no longer compile and the "Merge Conflicts Resolver" is of no use as I don't really understand the format of the files I am trying to merge.
Thanks, Tim

Hi Tim,
I think there is only one file on top level, that is generated by IDE and should be under version control - Makefile.
But if you create a project with existing sources, this file is not created by IDE (it is your makefile).
All files inside "nbproject" directory can be checked in, though there is no support to merge them in case of conflicts,
so it is up to you - to keep them under CVS or not. There is a subdirectory "private" inside "nbproject" - it contains
private (user specific) files, that should not be under version control.
All files, that start with ".make.state", are temporary files, and they should not be under version control.
I agree with your suggestion to help users to prevent check in of temporary files, but our IDE is not that smart :-),
and I don't think it is doable in next release - there are too many plugins, that can generate temporary files.
But I'll pass your suggestion to the IDE team.
Thanks,
Nik
Edited by: NikMolchanov on Sep 7, 2009 9:22 PM

Similar Messages

Error when starting a SWITCH branch (8987)

Hi,
I am testing my workflow which starting with a multiple condition (switch). The workflow process is stopped with the error:
Error when starting a SWITCH branch (8987).
The workflow check shows no warnings or errors. What could be the problem?
Thank you in advance.
/Elvez

Check the workflow container (of the started workflow instance) and see if you spot a problem with one of the container objects used in your switch conditions.

Multiple condition : Error when starting a SWITCH branch

Hi,
In our Z Leave Workflow,I am facing the errors listed below.
Error when starting a SWITCH branch
Error during CASE evaluation in SWITCH mode for node 0000000158
Operator 'EQ': The value of the left operand cannot be determined
Error in the evaluation of expression '<???>&REQ.STATUS&' for item '1'
Unable to determine the value of component ''
It gives error in Multiple condition Request Approved? which is similar to standard WF12300111 node number 158 (u can say copy of WF12300111
This multiple condition works in some scenario But it gives dump at other scenario .
I have checked the value of REQ.STATUS in runtime. It populates the value as 'POSTED' in runtime,
Please suggest if any solution on this.
Regards,
Kalpesh

Hi There was some problem with task which was comprising class CL_PT_REQ_WF_ATTRIBS and APPROVE method. This method is to change the status of particular leave workitem.After running this particular task ,the status was not changin instantly.This method locks particular workitem and was releasing the workitem once the WF gets completed.Hence I was getting REQ.STATUS as sent.
I have changed that task with following code in new task...
DATA:
      REQUEST_ID TYPE PTARQ_DEDUCTION-REQUEST_ID,
request      TYPE REF TO if_pt_req_request,
    new_status   TYPE tim_req_status.
SWC_GET_ELEMENT CONTAINER 'REQUEST_ID' REQUEST_ID.
CALL FUNCTION 'ENQUEUE_EPTREQ'
    EXPORTING
      mode_ptreq_header = 'E'
      request_id        = request_id
    EXCEPTIONS
      foreign_lock      = 1
      system_failure    = 2
      OTHERS            = 3.
IF sy-subrc <> 0.
    MESSAGE w058(hrtim_abs_req) WITH request_id.
ELSE.
CALL METHOD ca_pt_req_header=>agent->get_request
      EXPORTING
        im_request_id = request_id
      IMPORTING
        ex_request    = request.
execute state transition
    CALL METHOD request->initiate_state_transition
      EXPORTING
        im_transfer_event = 'APPROVE'
      IMPORTING
        ex_new_status     = new_status.
COMMIT WORK.
    CALL FUNCTION 'DEQUEUE_EPTREQ'
      EXPORTING
        request_id = request_id.
ENDIF.
This will create new status for leave item during WF processing.
Apart from that also added Wait for 2 minutes after that task....
Thanks for your help.
Regards,
Kalpesh

Switch error : error when starting a switch branch

Hello,
I'm facing an issue on a simple switch :
I have the following condition : &change& = X or &molga& = AE
when the two conditions are OK, the WF is OK, but :
when the second part is false (example : molga = 14 or molga = EG), the WF fails and I have this message : "error when starting a switch branch". I don't understand why knowing that the element "molga" is defined in the WF container as T500P-molga !
Many thanks,
Karim

Hi,
I think both the conditions are failing, &Change& ne 'X' and &molga& ne AE. So the WKF will be going into error and says, "error when starting a switch branch". Please make sure you have other branches in the switch conditon step, to handle if both conditions failed. So WKF will take that branch.
Regards,
Vinoth

Error (Error when starting a SWITCH branch) while using container operation

HI Experts,
I am using container operation step for moving internal table (ref to sflight) to workarea.The error I found in the log is ' Error when starting a SWITCH branch'.Kindly help me in finding the solution.Below are the steps and code.
Result Element = lw_sflight             (Element ref to sflight with export and Import)
Assignment     =    =                     (Assign (contents of table are deleted first)
Expression      = &FLIGHT&             (Multi line container ref to sflight)
Operator          = Assignment
Expression      =                                 (Blank)
Thanks and Regards,
Srini

Hello,
Maybe you should show more information about the condition step instead of the container operation step.
A previous poster in SDN said they solved their problem by changing the order of the conditions.
regards
Paultje Bakker
Hanabi Technology

Switch branching in integration process

Hi,
I want to use a switch branching in integration process. The condition of the switch is to compare the source field value with a constant like
If /p1:MT_Pntmaster/field1 = "n/a" goto branch1 else
goto branch2.
How to achieve this in switch editor?
Because, in the editor, both left operand and the right operand directs for selecting a structure and i am unable to enter a constant value.
I appreciate your quick help.
Regards
Nagaraj.

Hi Nagaraj,
You can enter constant value in switch for comparasion.
Click on Condition in properties tab.
A new window opens up.
On the left side we need to select the Left Operand and in the Right side we need to select the Right Operand.
Now Click on the Right Side . Next to Hand+QuestionMark sign.
A new window opens up (expression editor).
You will see four options in the expression editor.
Select the first option Constant. Enter value "n/a".You are done.
If you still have any confusion let us know.
Regards,
Sumit

Problem with CVS conflict in .jpr file

Hi,
we have a project that approx 4 people will work on. We use CVS to do this.
We have a workspace with several projects. Now, if 2 people work on a project and both add some new entity objects, and person A
commits his changes, person B will get CVS conflicts when updating the project from CVS. Yesterday, I was person B.
First question: how can we work together on a project without getting these conflicts all the time?
Second question is this specific conflict:
I closed jdeveloper (903prev), since there's no way to resolve the conflict from inside jdeveloper. I edited the file, and tried to resolve the conflict. This is the conflict in the .prj file:
<<<<<<< core.jpr
<Item class="oracle.jbo.dt.jdevx.ui.JdxNode">
<URL protocol="ide.bc4j.file" path="/PMS/core/reservations/reservations.jbo"/>
<owner path="src/core.jpx"/>
<package>PMS.core.reservations</package>
<type>Package</type>
</Item>
=======
<Item class="oracle.jdevimpl.cm.dt.sqlplus.SqlNode">
<URL path="src/triggers.sql"/>
</Item>
1.4and this conflict:
<<<<<<< core.jpr
<Value>1031220960328</Value>
</Item>
<Item>
<Key>oracle.jbo.package.PMS.core.suitcases</Key>
<Value>1031316378531</Value>
=======
<Value>1031648137187</Value>
1.4Well, the first conflict is resolvable. But what about the second conflict? What are these <Value> numbers and which number belongs to what?
Third question:
core.xml (in my core package) contains a conflict too:
<<<<<<< core.xml
TimeStamp="1031220960328"
=======
TimeStamp="1031648137187"
1.4This is stupid. Ofcourse this leads to a conflict. But jdeveloper should be able to resolve this. How can we work with several people on a project if we get conflicts like these? CVS is great for working together on a project, I've used it for years. But from inside jdeveloper, it's giving me headaches. :-(
Greetings,
Ivo

Hi Ivo,
Unfortunately this looks like BC4J is storing timestamps in both project and package files. This leads to unresolvable conflicts in the files and CVS marks them for your attention. The same thing would happen under any SCM system in a concurrent multi-user environment.
We use an external CVS client so we have no influence on its ability to merge files of this type, however we can hopefully change the format of the files in question in an attempt to prevent this from occuring.
I have logged bug 2561497 agianst BC4J and published it so it can be tracked via metalink.
The most help I can provide is that the numbers look like timestamps so choosing the higher of the two numbers each time should resolve the merge successfully.
Thanks,
Geoff Waymark
JDev SCM Team
--------------------

New CVS source update and branch

The CVS repository has been updated so that it contains the same code that was part of the M8 binary release.
The M8 binaries can be downloaded by following the links under the "Open ESB 1.0 Experimental Community Preview " heading on this page:
https://open-esb.dev.java.net/public/download.html#binarySource
The directions to set up your own open-esb build are available here:
https://open-esb.dev.java.net/public/build-instructions.html
A cvs branch has also been created to mark this M8 release. You can check out the branch using the branch name R05M8.

I thought I read somewhere that Nokia was working on adding notification icons to the Glance screen. This would be GREAT if it is true! Would be nice to just take my phone out of my pocket and look at the screen to see if I have any notifications. That's a lot easier than some other phones that require you to push the power button and pull down a notification page. In no way am I saying that I don't want a notification center as well, because it would be GREAT to access all the notifcations in a centralized location after you know you have them. But the ability to "know" you have notifications is better with Glance than with JUST a notification center.
Attachments:
wp_ss_20130920_0002.png ‏101 KB
lumia-black-620x350.jpg ‏57 KB

Unable to switch to trunk from branch checked out with CVS

Help!
We've run into a can't get there from here issue of not being able to switch back to the trunk when we've checked out a branch from CVS.
Using JDeveloper Studio Edition Version 11.1.1.1.0
Scenario:
Working on maintained in CVS.
Create Branch on code B1. (Versioning -> Branch, Branch Name = "B1", Source = "Trunk")
Now we can't get back to the trunk. When you select switch branch it only shows HEAD. Select that and you end up on some IDE generated tag called "HEAD", where you can't add files or check in changes.
How can you get back to the trunk?
rodger...

Are you aware that "always view this page in IE" isn't a standard feature in Firefox? It's a feature of a Firefox extension, which is why you can't find it on a Firefox help page.
Check the download page for that particular extension to find out how to change that preference, or tell us which extension that is and we'll look for a FAQ page for that extension.

Can't get JSF sources from CVS

I'm trying to download the correct version of JSF to debug a problem I'm having with JSF in Glassfish. I'm using GF v2 b41c, which states that it uses JSF cvs tag: JSF_1_2_GFINT_B17. (See http://wiki.java.net/bin/view/Projects/GlassFishSourcesBundle.)
When I try to use CVS to get JSF, I get the following error msg:
"User rickhoro doesn't have <VersionControl - Read> access to project javaserverfaces-sources"
I'm using the following setup for CVS in NetBeans 5.5.1, but I get the same response with a CVS client.
Access Method: pserver
User: <my username>
Host: cvs.dev.java.net
Repository Path: /cvs
Module: javaserverfaces-sources
Branch: JSF_1_2_GFINT_B17
Do I need to request access from somebody? I find this strange -- JSF is open source now, correct? Why isn't it available?
Please help.

Thanks for detailed info, but still no solution here.
I downloaded the 1.2_04-p01-b10 source and added the src folders to the Sources tab of the Glassfish v2b41c server in NetBeans 5.5.1.
I'm using Seam, so I put a breakpoint in SeamPhaseListener.beforePhase(). When I click on the LifecycleImpl.execute() or LifecycleImpl.phase() in the Call Stack tab (of NB) the program counter (ie. cursor) appears on the wrong line -- about 8 lines off from where it should be: (see the following)
                while (listenersIterator.hasNext()) {
                    PhaseListener listener = listenersIterator.next();
                    if (phaseId.equals(listener.getPhaseId()) ||
                        PhaseId.ANY_PHASE.equals(listener.getPhaseId())) {
                        listener.beforePhase(event);   [SHOULD BE HERE]
        catch (Exception e) {
            if (LOGGER.isLoggable(Level.WARNING)) {
                LOGGER.warning("phase("
                               + phaseId.toString() [SHOWS UP HERE INSTEAD]
                               + ','
                               + context
                               +
                               ") threw exception: "
                               + e
                               + ' '
                               + e.getMessage()
                               +
                               "\n"
                               + Util.getStackTraceString(e));
            }I assume that these JSF sources do not match the binaries used by this Glassfish implementation. Is there any other reason I would be seeing this mismatch? Makes it pretty near impossible to debug the problem. Please, I would really appreciate further help here.
Thanks very much,
Rick

Error in multiple condition type switch

Hi,
I define a multiple condition as a switch for different processing branches for my
Workflow (all my attributes in the conditions are from the object).
I defined the Other Values outcome also.
When one of the conditions is true I received an error SWP103 "Error when starting a SWITCH branch"
It works fine when my process go to "other" outcome.
Thanks in Advance,
Ronit.

In my workflow the same error occured while using a mutliple condition with type Switch.
A short explanation of my workflow:
- container operation: errorcounter = errorcounter + 1
- multiple condition
1. errorcounter =< 4
2. errorcounter = 5
3. other values
- activity
- loop until (depending on outcome activity).
The first time while executing the loop went perfect, but the second time it failed and based on the message I guess it failed on the multiple condition. What I also notices in the technical view was that the errorcounter wasn't updated.
I guess the container operation and multiple condition bumped into eachother (somehow?) and caused the error.
My solution:
Put a wait stap between step 1 and 2 and it works fine.
I'm not sure this case is applicable to you, but may be a hint in the right direction. Good luck!

Error in multiple switch condition

Dear All,
In my workflow i have a multiple condition step in which i am using SWITCH which on execution gives the following error :
1.Work item 000000004008: Object FLOWITEM method EXECUTE cannot be executed
->Error when starting a SWITCH branch.
This switch has 3 conditions: based on the parameter &decision&.
At this i am checking there is a value in the workflow container for the decision,still gives this error.
Please tell any possible resons for this.

I am using the RFC to trigger and after the approval step
i am passing the value of the decision into the container.
Now tell me where do i pass the workitem_id??
What RFC you are using to trigger the approval step
See all I want to say is for every BO you ll have a key attribute through which it will instantiate the BO so for FLOWITEM BO workitem id is the key attribute
and
For e;g
in the FM
SWE_EVENT_CREATE
EXPORTING
Business Object name = 'FLOWITEM'.
Business Object Key = '16033'.

11g: CVS integration crashes CVSNT

Hi!
When I turn on CVS integration and switch it to external CVS, then whenever I open the History tab of a file and select a CVS revision I get a crash dump dialog from CVS.
Same happens when I browse the repository and double-click a file in the repository navigator.
CVS Version (External)     (CVSNT) 2.5.03 (Scorpio) Build 2382 (client/server)
Versioning Support     oracle.jdeveloper.vcs     11.1.1.0.31.51.56     Loaded
Versioning Support for CVS     oracle.jdeveloper.cvs     11.1.1.0.31.51.56     Loaded
I cannot switch to the internal CVS since we're using SSPI.
Is that problem known and is there a workaround?
Sascha

Hi!
Arthur Barrett from March Hare replied in the CVSNT mailing list.
http://www.cvsnt.org/pipermail/cvsnt/2008-October/031366.html
I did what he requested. I downloaded a copy of Zen RC9 and it crashed in the same way. I created client comm traces as requested and sent them to March Hare.
Let me point out again, that we all have vanilla copies of Scorpio on our machines. I only installed Zen RC8 and RC9 to see if the problem still exists with these versions.
I downloaded the PDB files for Scorpio and received the (now correct?) stack trace:
Function     Arg 1     Arg 2     Arg 3   Source
cvsapi!Convert+21b     00000000     00000000     00000001
cvsapi!get_date+259     00d66dc0     0012f760     00000001
cvs!Make_Date+53     00d66dc0     0049c25c     00d68c80
cvs!patch+103     00000006     01079e78     00d65b56
cvs!main+137c     00000006     01079e78     00000000
cvs!wmain+12d     0000000b     00d64f28     00d67268
cvs!wmainCRTStartup+143     0117bb12     6361726f     7ffd4000
kernel32!BaseProcessStart+23     0048f058     00000000     78746341    That was also sent to March Hare. Later, I will send the crash dump file of Zen RC9 to March Hare. The file is too large to do it now.
I couldn't download the PDB files for Zen (because there are none) but I assume that the crash trace will look the same.
I also unzipped a vanilla copy of JDev10.1.3.4 and CVSNT works well with that version (as reported by tilemahos). No problems opening a file from the CVS Navigator.
That strongly suggests that there is something wrong in JDev11, don't you think?
Sascha

Struts Diagram and CVS Problems

We're having a difficult time with the StrutsPageFlow.oxd_struts and CVS. Anytime a developer makes a change to the Struts diagram and commits the struts-config.xml file, the StrutsPageFlow.oxd_struts file also gets committed. When a different developer updates the struts-config.xml file the StrutsPageFlow.oxd_struts file has a conflict on just about every item. We're also encountering this on our *.jpr and bc4j.xcfg files.
JDeveloper 10g is stealing a lot of our time as we're having to manually work around a lot of CVS conflicts on files that are not shown in the project but associated with project files like the struts-config.
Anyone else having CVS issues with these "behind-the-scene" files?

Hi Jason,
Unfortunately, this is a known issue. The only workaround we can suggest for struts at the moment is using an exclusive editing mode. Whenever a developer needs to modify the struts diagram, he should issue a cvs edit. Other developers should use the "List Editors" functionality in JDev to check whether someone is currently editing the file.
We're working on resolving these team development issues in the 10.1.3 release.
Thanks,
Brian

XFCE4 CVS

pkgname=libxfce4util
pkgver=4.2.0cvs
pkgrel=1
pkgdesc="CVS version of XFCE"
url="http://www.xfce.org"
license=""
depends=(glib2)
makedepends=(cvs)
conflicts=()
backup=()
install=
source=()
md5sums=()
build() {
cd $startdir/src/
cvs -d:pserver:[email protected]:/cvsroot/xfce co xfce4/$pkgname
cd xfce4/$pkgname
./configure --prefix=/opt/xfce4
make || return 1
make DESTDIR=$startdir/pkg install
Ha! What you've all been waiting for. Here's a cvs package for the cvs version of xfce.
EDIT:
Oops, my bad. Fixed the --prefix.
To get all the libraries and different parts of xfce, just change the $pkgname variable to the different component. Here's all the available components:
libxfce4util
libxfcegui4
libxfce4mcs
xfce-mcs-manager
xfce-mcs-plugins
xfce4-panel
xfwm4
xfce-utils
xfce4-modules
xffm
xfdesktop
xfce4-session
xfprint
gtk-xfce-engine-2
xfce4-iconbox
xfce4-mixer
xfce4-systray
xfce4-themes
xfce4-toys
xfce4-trigger-launcher
xffm-icons
xfwm4-themes
xfcalendar
xfce4-appfinder
Just install the libaries first, and then the rest of the components and you should be alright. Enjoy the bleeding edge of the greatest linux desktop available!

PKGBUILD:
pkgname=xfce4-cvs
pkgver=4.2.0
pkgrel=1
pkgdesc="CVS version of XFCE"
url="http://www.xfce.org"
license=""
depends=(glib2 gtk2 libxml2 dbh)
makedepends=(cvs)
conflicts=()
backup=()
install=xfce4-cvs.install
source=(xfce4-cvs.profile)
md5sums=()
build() {
cd $startdir/src/
# Get source via CVS
cvs -d:pserver:[email protected]:/cvsroot/xfce co xfce4
cd xfce4/
# Register profile
install -D -m755 ../xfce4-cvs.profile $startdir/pkg/etc/profile.d/xfce4-cvs.sh
# Set pkgconfig path
export PKG_CONFIG_PATH=$startdir/pkg/opt/xfce4-cvs/lib/pkgconfig
# Build stuff
cd libxfce4util
./configure --prefix=/opt/xfce4-cvs
make || return 1
make DESTDIR=$startdir/pkg install
cd ../libxfcegui4
./configure --prefix=/opt/xfce4-cvs
make || return 1
make DESTDIR=$startdir/pkg install
cd ../libxfce4mcs
./configure --prefix=/opt/xfce4-cvs
make || return 1
make DESTDIR=$startdir/pkg install
./configure --prefix=/opt/xfce4-cvs
make || return 1
make DESTDIR=$startdir/pkg install
cd ../xfce4-panel
./configure --prefix=/opt/xfce4-cvs
make || return 1
make DESTDIR=$startdir/pkg install
xfce4-cvs.profile:
export PATH=$PATH:/opt/xfce4-cvs/bin
export MANPATH=$MANPATH:/opt/xfce4-cvs/man
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/xfce4-cvs/lib/pkgconfig
xfce4-cvs.install
post_install() {
if ! [ `grep '/opt/xfce4-cvs/lib' etc/ld.so.conf` ]; then
echo "/opt/xfce4-cvs/lib" >> etc/ld.so.conf
sbin/ldconfig -r .
fi
post_upgrade() {
/bin/true
pre_remove() {
cat etc/ld.so.conf | grep -v '/opt/xfce4-cvs/lib' >/tmp/.pacxfce4-cvs
mv /tmp/.pacxfce4-cvs etc/ld.so.conf
chmod 644 etc/ld.so.conf
sbin/ldconfig -r .
op=$1
shift
$op $*
That's what I have so far.. That's enough for the new panel... I'll get the rest later, because I can't get this to compile... hmm.. anyone else have luck?

CVS conflict on switch branch

Similar Messages

Maybe you are looking for