Bug 342044

Description libing wang 2011-04-06 12:20:46 EDT

I am opening this bug to track all the possible test cases corresponding to bug 339045.
As there is no agreement yet about how the server side will support the merge , the test cases are not yet applied to JS unit tests but some steps will be translated t ojs unit test later.

The test cases are based on two repos:
1.repo1 is the initial git repo and has a file called file.txt with contents as below
line one
line two by repo1
line three
line four

2.repo2 is the clone of repo1

I am writing test case 1 to address all the current problems happened internally.More cases will come afterward.

Test case 1 : changing the same line on both repo
Steps:
1.In repo1 at Orion, change "line two" into "line two by repo1".Save and commit.
2.In repo2 at Orion, change "line two" into "line two by repo2".Save and commit. 
3.In repo2 at git bash , do git pull , get the following:
Auto-merging file.txt
CONFLICT (content): Merge conflict in file.txt
Automatic merge failed; fix conflicts and then commit the result.
** I think this step is reasonable as we should not stop users from using combination of Orion git and git command even we will have git pull support.
4.Go to git status page for repo2

Expected result:
1.file.txt is marked as conflicted in the unstaged area.
2.Clicking on file.txt brings inline viewer with conflicts colored specially (red?)

Actual result:
In the unstaged area , file.txt appears twice , marked as removed and modified.
In the staged area ,file.txt appears twice as , marked as added and changed.
Clicking on the file brings error because there was already something wrong at the first place.

What happened behind the scene:
**The file content at repo2 is:
line one
<<<<<<< HEAD
line two by repo2
=======
line two by repo1
>>>>>>> 3cb9a690f9f6f9d95ee979045ffd4d48f7a0237c
line three
line four

**The git status response is :
{
  "Added": [{
    "Git": {
      "CommitLocation": "http://localhost:8080/git/commit/HEAD/file/T/file.txt",
      "DiffLocation": "http://localhost:8080/git/diff/Default/file/T/file.txt",
      "IndexLocation": "http://localhost:8080/git/index/file/T/file.txt"
    },
    "Location": "http://localhost:8080/file/T/file.txt",
    "Name": "file.txt",
    "Path": "file.txt"
  }],
  "Changed": [{
    "Git": {
      "CommitLocation": "http://localhost:8080/git/commit/HEAD/file/T/file.txt",
      "DiffLocation": "http://localhost:8080/git/diff/Cached/file/T/file.txt",
      "IndexLocation": "http://localhost:8080/git/index/file/T/file.txt"
    },
    "Location": "http://localhost:8080/file/T/file.txt",
    "Name": "file.txt",
    "Path": "file.txt"
  }],
  "Missing": [{
    "Git": {
      "CommitLocation": "http://localhost:8080/git/commit/HEAD/file/T/file.txt",
      "DiffLocation": "http://localhost:8080/git/diff/Default/file/T/file.txt",
      "IndexLocation": "http://localhost:8080/git/index/file/T/file.txt"
    },
    "Location": "http://localhost:8080/file/T/file.txt",
    "Name": "file.txt",
    "Path": "file.txt"
  }],
  "Modified": [{
    "Git": {
      "CommitLocation": "http://localhost:8080/git/commit/HEAD/file/T/file.txt",
      "DiffLocation": "http://localhost:8080/git/diff/Default/file/T/file.txt",
      "IndexLocation": "http://localhost:8080/git/index/file/T/file.txt"
    },
    "Location": "http://localhost:8080/file/T/file.txt",
    "Name": "file.txt",
    "Path": "file.txt"
  }],
  "Removed": [],
  "Untracked": []
}

**Diff content on /git/diff/Default/file/T/file.txt
diff --git a/file.txt b/file.txt
index 4a75dc8..47965b5 100644
--- a/file.txt
+++ b/file.txt
@@ -1,4 +1,8 @@
 line one
-line two
+<<<<<<< HEAD
+line two by repo2
+=======
+line two by repo1
+>>>>>>> 3cb9a690f9f6f9d95ee979045ffd4d48f7a0237c
 line three
 line four
diff --git a/file.txt b/file.txt
deleted file mode 100644
index 820b77e..0000000
--- a/file.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-line one
-line two by repo2
-line three
-line four
diff --git a/file.txt b/file.txt
deleted file mode 100644
index 3ba1817..0000000
--- a/file.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-line one
-line two by repo1
-line three
-line four

**Diff content on /git/diff/Cached/file/T/file.txt
diff --git a/file.txt b/file.txt
index 820b77e..4a75dc8 100644
--- a/file.txt
+++ b/file.txt
@@ -1,4 +1,4 @@
 line one
-line two by repo2
+line two
 line three
 line four
diff --git a/file.txt b/file.txt
new file mode 100644
index 0000000..820b77e
--- /dev/null
+++ b/file.txt
@@ -0,0 +1,4 @@
+line one
+line two by repo2
+line three
+line four
diff --git a/file.txt b/file.txt
new file mode 100644
index 0000000..3ba1817
--- /dev/null
+++ b/file.txt
@@ -0,0 +1,4 @@
+line one
+line two by repo1
+line three
+line four