[cvsnt] Facing an issue while merging and checking in the file

Wed Jul 25 13:40:37 BST 2007

Hi,
            I am facing an issue while merging and checking in the file. i
am attaching a word document also with this mail.
Below is the senario

Revision for file Class1.cs

Class1.cs version Branch
 1.1
 1.2       B_1
              1.2.2.1
              1.2.2.2
              1.2.2.3
 1.3      B_2
             1.3.2.1
             1.3.2.2
             1.3.2.3
 1.4

Class1.cs  Ver 1.2.2.3 on branch  B_1

public class Class1
 {
  public Class1()
  {
   //
   // TODO: Add constructor logic here
   //
   1) c
       B_1) 1) c
       B_1) 2) c
       B_1) 3) c
       B_1) 3) c
  }
 }

Class1.cs  Ver 1.3.2.3 on branch  B_2

public class Class1
 {
  public Class1()
  {
   //
   // TODO: Add constructor logic here
   //

   2) c
     B_2) 1) C
     B_2) 2) C
  }
 }

We have checked out the revision 1.2.2.3 as the local copy of branch B_1
D:\CVS\TestingApps\1cal\ClassLibrary36>cvs update -r B_1 class1.cs
D:\CVS\TestingApps\1cal\ClassLibrary36>cvs edit -x class1.cs

When we use status command we get current status as

D:\CVS\TestingApps\1cal\ClassLibrary36>cvs status class1.cs
=================================File: Class1.cs         Status: Up-to-date

   Working revision:    1.2.2.3
   Repository revision: 1.2.2.3 /repository/ClassLibrary36/Class1.cs,v
   Expansion option:    kv
   Commit Identifier:   e9c46a6f7e16dac
   Sticky Tag:          B_1 (branch: 1.2.2)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)

When we use editors command we get current output as

D:\CVS\TestingApps\1cal\ClassLibrary36>cvs editors class1.cs
Class1.cs       KevinA  Wed Jul 25 10:56:52 2007 GMT    PNEITS1W-O1021D
D:\CVS\TestingApps\1cal\ClassLibrary36

The following changes are made to class1.cs (i.e. line # 11)

1. {
2.  public Class1()
3.  {
4.   //
5.   // TODO: Add constructor logic here
6.   //
7.   1) c
8.       B_1) 1) c
9.       B_1) 2) c
10.       B_1) 3) c
11.     B_1) 3) c
12.
13.
14.  }
15. }

To checkin the latest version on branch B_1 to Branch  B_2

We are  using the update command as

D:\CVS\TestingApps\1cal\ClassLibrary36>cvs update -r B_2 Class1.cs
RCS file: /repository/ClassLibrary36/Class1.cs,v
retrieving revision 1.2.2.3
retrieving revision 1.3.2.3
Merging differences between 1.2.2.3 and 1.3.2.3 into Class1.cs
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in Class1.cs
C Class1.cs

The contents of class1.cs are as

{
  public Class1()
  {
   //
   // TODO: Add constructor logic here
   //
<<<<<<< Class1.cs
   1) c
       B_1) 1) c
       B_1) 2) c
       B_1) 3) c
     B_1) 3) c

===
   2) c
     B_2) 1) C
     B_2) 2) C
>>>>>>> 1.3.2.4
  }
 }
}

The status command gives
D:\CVS\TestingApps\1cal\ClassLibrary36>cvs status class1.cs
=================================File: Class1.cs         Status: File had conflicts on merge

   Working revision:    1.3.2.3
   Repository revision: 1.3.2.3 /repository/ClassLibrary36/Class1.cs,v
   Expansion option:    kv
   Commit Identifier:   82c46a72bf417b9
   Sticky Tag:          B_2 (branch: 1.3.2)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)

The editors command gives no output
D:\CVS\TestingApps\1cal\ClassLibrary36>cvs editors class1.cs

As the editors command does not return the proper file status we are unable
to checkin the file even after resolving the conflicts with the check of
valid edits.

Note: if no change is made to the class1.cs file after checkout
The update commands gives the following out put
D:\CVS\TestingApps\1cal\ClassLibrary36>cvs update -r B_2 Class1.cs
P Class1.cs

D:\CVS\TestingApps\1cal\ClassLibrary36>cvs editors class1.cs
Class1.cs       KevinA  Wed Jul 25 11:01:26 2007 GMT    PNEITS1W-O1021D
D:\CVS\TestingApps\1cal\ClassLibrary36

Since in this case the editors command returns an output we are able to
checkin the file.

Now in first case i.e. files are getting merged, the status of the checkout
file is getting modified. File is getting unedited after merging so I was
unable to proceed for checkin the file.

Please let us know if some one has faced and resolved this kind of issue.

Regards,
Ved