Merge file problem

[db-esm]

Sometimes when a merge is needed for a check-in, we get the following error message (on the Merge dialog):

 

"An error occurred processing your request."

 

We are still on v3, but we plan to upgrade soon - I was wondering if this is a known issue and/or has been fixed for v4.

It seems to occur when a manual merge is required that may be quite complicated because of lots of changes.

 

Thanks!

 

Server log data:

 

2013-04-22 10:25:32,011 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Retrieve repository list
2013-04-22 10:25:32,011 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Retrieve repository list
2013-04-22 10:25:38,095 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf - TryCheckin initial security check [0] ms
2013-04-22 10:25:38,110 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf - TryCheckin operation [15] ms
2013-04-22 10:25:55,863 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Retrieve repository list
2013-04-22 10:25:55,863 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Retrieve repository list
2013-04-22 10:26:04,895 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf - TryCheckin initial security check [0] ms
2013-04-22 10:26:04,895 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf - TryCheckin operation [0] ms
2013-04-22 10:26:06,892 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Get repository info pi_1_1
2013-04-22 10:26:06,939 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Retrieve repository list
2013-04-22 10:26:06,939 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - GetSmartBranch starting points br /GT_Benning and cset  and label  at repository 3
2013-04-22 10:26:06,939 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Retrieve repository list
2013-04-22 10:26:06,939 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Get info for branch /GT_Benning at repository ID 3
2013-04-22 10:26:06,939 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Get info for branch /Benning at repository ID 3
2013-04-22 10:26:06,954 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -     RepId [3] SecuredItemHandler-SecuredItemHandler-Security CheckRevisionInfo 0 ms. 12 revs
2013-04-22 10:26:07,001 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -     RepId [3] ItemHandler-GetRevisionsOnBranch: ObtainData: 47 ms
2013-04-22 10:26:07,001 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -     RepId [3] SecuredItemHandler-SecuredItemHandler-Security CheckRevisionInfo 0 ms. 203 revs
2013-04-22 10:26:07,001 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -     RepId [3] SecuredItemHandler-GetRevisionsOnBranch 47 ms. Security check 0 ms
2013-04-22 10:26:07,079 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -     RepId [3] ItemHandler-GetRevisionsOnBranch: ObtainData: 16 ms
2013-04-22 10:26:07,079 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -     RepId [3] SecuredItemHandler-SecuredItemHandler-Security CheckRevisionInfo 0 ms. 18 revs
2013-04-22 10:26:07,079 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -     RepId [3] SecuredItemHandler-GetRevisionsOnBranch 16 ms. Security check 0 ms
2013-04-22 10:26:07,781 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -         CmDataReader- Read 610 ms [sELECT  r.iobjid as iobjid, r.isize as isize, r.fiditem as fiditem, r.fidparentrevision as fidparentrevision, r.fidbranch as fidbranch, r.irevisionnumber as irevisionnumber, r.shash as shash, r.itype as itype, r.fidchangeset as fidchangeset, r.slast as slast , o.dtimestamp as dtimestamp, o.fidowner as fidowner, o.fidacl as fidacl FROM revision r, markerrealization mr, object o WHERE r.iobjid = o.iobjid AND  r.iobjid = mr.fidrevision AND   mr.fidmarker = 367789  ORDER BY r.fiditem]
2013-04-22 10:26:08,156 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -         CmDataReader- Read 343 ms [sELECT  ci.iobjid, ci.fiditem, ci.fidrevision, ci.sname, ci.fitemfsprotection FROM childrenitem ci, markerrealization mr WHERE  ci.fidrevision = mr.fidrevision AND   mr.fidmarker = 367789  ]
2013-04-22 10:26:08,171 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  UpdatePerf -     RepId [3] SecuredItemHandler-SecuredItemHandler-Security CheckRevisionInfo 16 ms. 4945 revs
2013-04-22 10:26:08,811 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Get repository info pi_1_1
2013-04-22 10:26:08,826 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  INFO  Operations - Get info for branch /GT_Benning at repository ID 3
2013-04-22 10:26:08,998 3088 David 00000000-0000-0000-0000-000000000000 DEV-PC  ERROR Operations - OnError catching exception Object reference not set to an instance of an object.
   at Codice.CM.Server.Merge.CommonAncestor.a(Hashtable A_0, Hashtable A_1, Hashtable A_2, Hashtable A_3, GraphNode A_4, ArrayList A_5, Int64& A_6)
   at Codice.CM.Server.Merge.CommonAncestor.CrossParentsNodes(Hashtable parents, Hashtable visited, Hashtable parentsToSearch, Hashtable visitedToSearch, ArrayList levelLca, Int64& root)
   at Codice.CM.Server.Merge.CommonAncestor.GetCommonAncestor(Int64 srcRevisionId, Int64 dstRevisionId)
   at m.b(MergeCandidateInfo A_0)
   at m.a(Boolean A_0, Boolean A_1, MergeCandidateInfo A_2)
   at m.a(Int32 A_0, ArrayList A_1, IList A_2)
   at g.a(MergeSource A_0, RevisionInfo A_1, IList A_2)
   at Codice.CM.Server.ItemHandler.ClassifyMerges(MergeSource mergeSource, RevisionInfo ancestorRevInfo, MergeDestinationRevisionArray dstRevisions)
   at Codice.CM.Server.SecuredItemHandler.ClassifyMerges(MergeSource source, RevisionInfo ancestorRevInfo, MergeDestinationRevisionArray dstRevisions)
   at Codice.CM.Server.TransactionInterceptor.ClassifyMerges(MergeSource source, RevisionInfo ancestorRevInfo, MergeDestinationRevisionArray dstRevisions)

2013-04-22 10:26:08,998 3088     ERROR Codice.CM.Server.ExceptionTracerSink - Dumping in-transit exception:Object reference not set to an instance of an object.
   at Codice.CM.Server.Merge.CommonAncestor.a(Hashtable A_0, Hashtable A_1, Hashtable A_2, Hashtable A_3, GraphNode A_4, ArrayList A_5, Int64& A_6)
   at Codice.CM.Server.Merge.CommonAncestor.CrossParentsNodes(Hashtable parents, Hashtable visited, Hashtable parentsToSearch, Hashtable visitedToSearch, ArrayList levelLca, Int64& root)
   at Codice.CM.Server.Merge.CommonAncestor.GetCommonAncestor(Int64 srcRevisionId, Int64 dstRevisionId)
   at m.b(MergeCandidateInfo A_0)
   at m.a(Boolean A_0, Boolean A_1, MergeCandidateInfo A_2)
   at m.a(Int32 A_0, ArrayList A_1, IList A_2)
   at g.a(MergeSource A_0, RevisionInfo A_1, IList A_2)
   at Codice.CM.Server.ItemHandler.ClassifyMerges(MergeSource mergeSource, RevisionInfo ancestorRevInfo, MergeDestinationRevisionArray dstRevisions)
   at Codice.CM.Server.SecuredItemHandler.ClassifyMerges(MergeSource source, RevisionInfo ancestorRevInfo, MergeDestinationRevisionArray dstRevisions)
   at Codice.CM.Server.TransactionInterceptor.ClassifyMerges(MergeSource source, RevisionInfo ancestorRevInfo, MergeDestinationRevisionArray dstRevisions)
   at Codice.CM.Server.TriggerInterceptor.ClassifyMerges(MergeSource mergeSource, RevisionInfo ancestorRevInfo, MergeDestinationRevisionArray dstRevisions)
   at System.Runtime.Remoting.Messaging.StackBuilderSink._PrivateProcessMessage(IntPtr md, Object[] args, Object server, Int32 methodPtr, Boolean fExecuteInContext, Object[]& outArgs)
   at System.Runtime.Remoting.Messaging.StackBuilderSink.SyncProcessMessage(IMessage msg, Int32 methodPtr, Boolean fExecuteInContext)

[calbzam]

Hi, are you able to reproduce the issue? Or it just happens sometimes. Merge system and Plastic in general have been improved a lot in Plastic 4. I would recommend you to upgrade if possible.

 We can assist you with the migration: ( http://www.plasticscm.com/infocenter/technical-articles/kb-migrating-from-plastic-scm-3-to-plastic-scm-4.aspx ). 

 

 

Best regards,

Carlos

[db-esm]

Yes, it seems to happen fairly consistently with files that require complex merges.

 

We do plan on upgrading, but we were wondering if this was a known issue with v3.

 

Thanks.

[manu]

Hi,

 

We fixed an issue pretty similar than your some time ago, can you please tell me which Plastic SCM 3 release are you using? If it's not the latest 3 release please upgrade and try again the merge.

 

If the upgrade doesn't solve the issue means that a file you are trying to merge is having a "null" parent in the DB. We can try to find our which one is causing the issue or perform the migration.

 

As Carlos said the merge system in Plastic SCM 4 is completely new and much better.

[db-esm]

v3 - 187.35.

 

Thanks for the info.

 

We plan on upgrading (to v4) in May - we were just wondering if we were experiencing a known issue, or if we were doing something wrong.