[stellation-res] Merging

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[stellation-res] Merging
From: "Jonathan Gossage" <jgossage@xxxxxxxx>
Date: Wed, 21 Aug 2002 20:03:46 -0400
Delivered-to: stellation-res@xxxxxxxxxxx
Importance: Normal
List-archive: <http://dev.eclipse.org/pipermail/stellation-res/>
List-help: <mailto:stellation-res-request@dev.eclipse.org?subject=help>
List-subscribe: <http://dev.eclipse.org/mailman/listinfo/stellation-res>, <mailto:stellation-res-request@dev.eclipse.org?subject=subscribe>
List-unsubscribe: <http://dev.eclipse.org/mailman/listinfo/stellation-res>, <mailto:stellation-res-request@dev.eclipse.org?subject=unsubscribe>
I am now into testing the merge operations as part of the MySQL integration
and I am encountering the following problem.

I start with a brand new database and issue the following Stellation
commands:

svc configure database x.xml
svc create StellationTest
svc checkout StellationTest

I now populate the workspace directory with 2 files, Hello.java and
test.bat.

Next I issue the following Stellation commands:

svc add Hello.java test.bat
svc checkin
svc fork 1.0
svc --force checkin
svc --revision 1.0 --force checkout StellationTest

At this point I modify the contents of the file Hello.java.

Next I issue the following Stellation command:

svc merge exact

I then check the file in the workspace and find the original file instead of
a merged file. The following log was produced:

0 [main] DEBUG org.eclipse.stellation.workspace.Svc  - checking user.dir
0 [main] DEBUG org.eclipse.stellation.workspace.Svc  - workspace option null
47 [main] INFO org.eclipse.stellation.workspace.Workspace  - start xerces
read of project doc
328 [main] INFO org.eclipse.stellation.workspace.Workspace  - end xerces
read of project doc
469 [main] INFO org.eclipse.stellation.workspace.Workspace  - start xerces
read of workspace doc
469 [main] INFO org.eclipse.stellation.workspace.Workspace  - end xerces
read of workspace doc
469 [main] INFO org.eclipse.stellation.workspace.LogManager  - start xerces
read log
484 [main] INFO org.eclipse.stellation.workspace.LogManager  - end xerces
read log
500 [main] DEBUG org.eclipse.stellation.workspace.Workspace  - attributes
initial size 4
547 [main] DEBUG org.eclipse.stellation.workspace.Connection  -
getAccessPoint
547 [main] DEBUG org.eclipse.stellation.workspace.Connection  - reposurl
mysql:stellation
547 [main] INFO org.eclipse.stellation.workspace.Connection  - mysql
databasestellation
562 [main] DEBUG org.eclipse.stellation.repos.MySqlAccessPoint  - mysql
access stellation
562 [main] DEBUG org.eclipse.stellation.repos.MySqlAccessPoint  - Connecting
to jdbc:mysql://localhost:3306/stellation
656 [main] DEBUG org.eclipse.stellation.workspace.Connection  - got access
point
656 [main] DEBUG org.eclipse.stellation.repos.DBAccessPoint  - authenticator
tag RELEASE
656 [main] DEBUG org.eclipse.stellation.repos.DBAccessPoint  - repository
authenticator tag RELEASE
656 [main] DEBUG org.eclipse.stellation.repos.DBAccessPoint  - Retrieving
authenticator type trivial
672 [main] DEBUG org.eclipse.stellation.workspace.Connection  -
checkingPassword admin 12arg34ent32
672 [main] DEBUG org.eclipse.stellation.workspace.Connection  - back from
checkPassword
703 [main] INFO org.eclipse.stellation.repos.DBAccessPoint  - registered
agent for artifact type Compound
703 [main] INFO org.eclipse.stellation.repos.DBAccessPoint  - registered
agent for artifact type Data
703 [main] INFO org.eclipse.stellation.repos.DBAccessPoint  - registered
agent for artifact type Link
703 [main] INFO org.eclipse.stellation.repos.DBAccessPoint  - registered
agent for artifact type Text
703 [main] DEBUG org.eclipse.stellation.repos.io.FileInput  - reading
project document: d:\StellationTest\SVC\project.xml
718 [main] DEBUG org.eclipse.stellation.repos.io.BaseInput  - input
artifacts returning map of size 3
718 [main] DEBUG org.eclipse.stellation.workspace.Workspace  - workspace
save with desired null
734 [main] DEBUG org.eclipse.stellation.workspace.Workspace  - workspace
IsModified false
734 [main] DEBUG org.eclipse.stellation.workspace.Workspace  - current
project signature 1708028831
734 [main] DEBUG org.eclipse.stellation.workspace.Workspace  - save modified
since checkout false for project StellationTest
734 [main] DEBUG org.eclipse.stellation.workspace.ProjectDocument  -
creating project document
734 [main] DEBUG org.eclipse.stellation.workspace.ProjectDocument  - add
atomic element 2, Hello.java
734 [main] DEBUG org.eclipse.stellation.workspace.ProjectDocument  - add
atomic element 3, test.bat
734 [main] INFO org.eclipse.stellation.workspace.Merge  - Merging changes
from branchexact into branch 1.0 in workspace.
750 [main] DEBUG org.eclipse.stellation.repos.Handle  - NCA of branchspec
exact.0 and branch with parents [1.0.1]
750 [main] DEBUG org.eclipse.stellation.repos.Handle  - NCA of branchspec
exact.0 and parents [1.0.1]
750 [main] DEBUG org.eclipse.stellation.repos.Handle  - All ancestors =
[main.1, main.0, 1.0.1, 1.0.0]
750 [main] DEBUG org.eclipse.stellation.repos.Handle  - V2: fringe =
[exact.0]
750 [main] DEBUG org.eclipse.stellation.repos.Handle  - V2: fringe = [1.0.1,
exact.0]
750 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  -
DirectoryBranchImage: initializing with root =null
765 [main] DEBUG org.eclipse.stellation.repos.io.DirectoryInput  - directory
input compressed false
765 [main] DEBUG org.eclipse.stellation.repos.io.DirectoryInput  -
directory input d:\StellationTest\SVC\Content\0\changed
765 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieveBranchVersion: StellationTest, branch exact
765 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - setting
root id to 1
765 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - In
retrieve: ID 3 version 0  root 1
In TextArtifacts.retrieveArtifacts
765 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieving, agent type Text
765 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Starting text artifact retrieval
765 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
retrieving text artifacts...
781 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Retrieving artifact:  2, version=0
797 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  - saving
artifact 2 to d:\StellationTest\SVC\Content\0\changed\2
797 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Retrieving artifact:  3, version=0
797 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  - saving
artifact 3 to d:\StellationTest\SVC\Content\0\changed\3
797 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieving, agent type Data
797 [main] DEBUG org.eclipse.stellation.repos.artifact.DataArtifactAgent  -
Starting data artifacts retrieval
797 [main] DEBUG org.eclipse.stellation.repos.artifact.DataArtifactAgent  -
retrieving data artifacts...
797 [main] DEBUG org.eclipse.stellation.repos.artifact.DataArtifactAgent  -
retrieved data artifacts
797 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieving, agent type Compound
797 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - Starting
compound artifact retrieval
797 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - retrieving
project StellationTest branchname exact  version 0
812 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - In retrieve:
successfully retrieved compounds
812 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - Done computing
non-empty compounds
812 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - SQL statement
SELECT bc.aid,bc.vid FROM BranchContents as bc,Artifacts as ai, Branches as
branches WHERE branches.project = 'StellationTest' AND branches.name =
'exact' AND branches.id = bc.branch AND bc.branchvid = 0 AND ai.id = bc.aid
AND ai.type = 'Compound'
812 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - In retrieve:
done computing empty compounds
812 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - returning from
retrieve compounds
812 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieving, agent type Link
812 [main] DEBUG org.eclipse.stellation.repos.artifact.LinkArtifactAgent  -
Starting link artifacts retrieval
812 [main] DEBUG org.eclipse.stellation.repos.artifact.LinkArtifactAgent  -
retrieving StellationTest exact 0
812 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - retrieve
branch point 1
812 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - start
retrieve executables
828 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - end
retrieve executables
828 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - start
retrieve properties
828 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - end
retrieve properties
828 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - retrieve
branch point 2
828 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - end
retrieve with root 1
828 [main] DEBUG org.eclipse.stellation.repos.MergeManager  - Computing NCA
for merge: NCA(exact.0' Branch image list:
  project StellationTest
  branch name 1.0
  version 1
  root 1
  parents:
    parent 1.0   version 1
  artifacts:
  id 1  directory           id 2  Hello.java
        id 3  test.bat

  id 2  null document

  id 3  null document

)
828 [main] DEBUG org.eclipse.stellation.repos.Handle  - NCA of branchspec
exact.0 and branch with parents [1.0.1]
828 [main] DEBUG org.eclipse.stellation.repos.Handle  - NCA of branchspec
exact.0 and parents [1.0.1]
828 [main] DEBUG org.eclipse.stellation.repos.Handle  - All ancestors =
[main.1, main.0, 1.0.1, 1.0.0]
828 [main] DEBUG org.eclipse.stellation.repos.Handle  - V2: fringe =
[exact.0]
828 [main] DEBUG org.eclipse.stellation.repos.Handle  - V2: fringe = [1.0.1,
exact.0]
828 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  -
DirectoryBranchImage: initializing with root =null
828 [main] DEBUG org.eclipse.stellation.repos.io.DirectoryInput  - directory
input compressed false
828 [main] DEBUG org.eclipse.stellation.repos.io.DirectoryInput  -
directory input d:\StellationTest\SVC\Content\0\ancestor
828 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieveBranchVersion: StellationTest, branch 1.0
828 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - setting
root id to 1
828 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - In
retrieve: ID 2 version 1  root 1
In TextArtifacts.retrieveArtifacts828 [main] DEBUG
org.eclipse.stellation.repos.RetrievalManager  - retrieving, agent type Text
828 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Starting text artifact retrieval
828 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
retrieving text artifacts...

843 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Retrieving artifact:  2, version=0
843 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  - saving
artifact 2 to d:\StellationTest\SVC\Content\0\ancestor\2
843 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Retrieving artifact:  3, version=0
843 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  - saving
artifact 3 to d:\StellationTest\SVC\Content\0\ancestor\3
843 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieving, agent type Data
843 [main] DEBUG org.eclipse.stellation.repos.artifact.DataArtifactAgent  -
Starting data artifacts retrieval
843 [main] DEBUG org.eclipse.stellation.repos.artifact.DataArtifactAgent  -
retrieving data artifacts...
843 [main] DEBUG org.eclipse.stellation.repos.artifact.DataArtifactAgent  -
retrieved data artifacts
859 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieving, agent type Compound
859 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - Starting
compound artifact retrieval
859 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - retrieving
project StellationTest branchname 1.0  version 1
859 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - In retrieve:
successfully retrieved compounds
859 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - Done computing
non-empty compounds
859 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - SQL statement
SELECT bc.aid,bc.vid FROM BranchContents as bc,Artifacts as ai, Branches as
branches WHERE branches.project = 'StellationTest' AND branches.name = '1.0'
 AND branches.id = bc.branch AND bc.branchvid = 1 AND ai.id = bc.aid AND
ai.type = 'Compound'
859 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - In retrieve:
done computing empty compounds
859 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - returning from
retrieve compounds
859 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  -
retrieving, agent type Link
859 [main] DEBUG org.eclipse.stellation.repos.artifact.LinkArtifactAgent  -
Starting link artifacts retrieval
859 [main] DEBUG org.eclipse.stellation.repos.artifact.LinkArtifactAgent  -
retrieving StellationTest 1.0 1
859 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - retrieve
branch point 1
859 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - start
retrieve executables
859 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - end
retrieve executables
859 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - start
retrieve properties
875 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - end
retrieve properties
875 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - retrieve
branch point 2
875 [main] DEBUG org.eclipse.stellation.repos.RetrievalManager  - end
retrieve with root 1
875 [main] INFO org.eclipse.stellation.repos.MergeManager  - MERGE with
changed = exact.0, ancestor = 1.0.1
875 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  -
DirectoryBranchImage: initializing with root =1
875 [main] DEBUG org.eclipse.stellation.repos.io.DirectoryInput  - directory
input compressed false
875 [main] DEBUG org.eclipse.stellation.repos.io.DirectoryInput  -
directory input d:\StellationTest\SVC\Content\0\result
875 [main] DEBUG
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - Merging
compound 1
875 [main] INFO
rg.eclipse.stellation.repos.artifact.CompoundArtifactAgent  - Computing true
merge
875 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Merging text ID = 2
875 [main] INFO org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Merge of artifact 2: computing true merge
890 [main] DEBUG org.eclipse.stellation.repos.util.TextUtils  - In LCS,
cross-occurence LocationIterator has entries
890 [main] DEBUG org.eclipse.stellation.repos.util.TextUtils  - In LCS,
cross-occurence LocationIterator has entries
890 [main] DEBUG org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Merging text ID = 3
906 [main] INFO org.eclipse.stellation.repos.artifact.TextArtifactAgent  -
Merge of artifact 3: computing true merge
906 [main] DEBUG org.eclipse.stellation.repos.util.TextUtils  - In LCS,
cross-occurence LocationIterator has entries
906 [main] DEBUG org.eclipse.stellation.repos.util.TextUtils  - In LCS,
cross-occurence LocationIterator has entries
906 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  - saving
artifact 2 to d:\StellationTest\SVC\Content\0\result\2
906 [main] DEBUG org.eclipse.stellation.repos.DirectoryBranchImage  - saving
artifact 3 to d:\StellationTest\SVC\Content\0\result\3
906 [main] INFO org.eclipse.stellation.workspace.Merge  - Cleaning out old
image for d:\StellationTest
906 [main] INFO org.eclipse.stellation.workspace.Merge  - name
d:\StellationTest/Hello.java unchanged
906 [main] INFO org.eclipse.stellation.workspace.Merge  - name
d:\StellationTest/test.bat unchanged
922 [main] DEBUG org.eclipse.stellation.workspace.ProjectDocument  -
createdocument from bi : StellationTest, 1.0, 1.
922 [main] DEBUG org.eclipse.stellation.workspace.Workspace  - enter output
project document
953 [main] DEBUG org.eclipse.stellation.workspace.Merge  - Project file
generated after merge
953 [main] DEBUG org.eclipse.stellation.workspace.Merge  -
org.eclipse.stellation.workspace.Workspace@5ad5c6
953 [main] DEBUG org.eclipse.stellation.workspace.Connection  -
disconnecting from access point
953 [main] DEBUG org.eclipse.stellation.workspace.LogManager  - closing log
953 [main] DEBUG org.eclipse.stellation.workspace.LogManager  - log size 2
953 [main] DEBUG org.eclipse.stellation.workspace.LogManager  - writing log
document d:\StellationTest\SVC\log.xml
968 [main] DEBUG org.eclipse.stellation.workspace.Workspace  - workspace
closed
968 [main] INFO org.eclipse.stellation.workspace.Svc  - max line length 69

Am I right in assuming that this was not correct behaviour. I am about to
dive into the code to see what is going on.

Regards

Jonathan Gossage

Personal Email
jgossage@xxxxxxxx

Business Email
jonathan@xxxxxxxxxxxxxx
Follow-Ups:
- RE: [stellation-res] Merging
  - From: Jonathan Gossage
Prev by Date: Re: [stellation-res] Finding documentation
Next by Date: RE: [stellation-res] Merging
Previous by thread: [stellation-res] Finding documentation
Next by thread: RE: [stellation-res] Merging
Index(es):
- Date
- Thread
Breadcrumbs
