diff options
author | Metalrom <romain.magny@gmail.com> | 2013-01-16 13:36:58 +0400 |
---|---|---|
committer | nulltoken <emeric.fermas@gmail.com> | 2013-01-16 21:50:14 +0400 |
commit | 849c21e9cc986d8716859a97f7b50fb7754065c3 (patch) | |
tree | 2b117869950896a871402d821ab126a8251d386a | |
parent | 29b23fd6fd0bba491e76fbc29b50225eace667c7 (diff) |
Add test repository with merge conflicts
51 files changed, 80 insertions, 0 deletions
diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/conflicts-one.txt b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/conflicts-one.txt new file mode 100644 index 00000000..8aad34cc --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/conflicts-one.txt @@ -0,0 +1,5 @@ +<<<<<<< HEAD +This is most certainly a conflict! +======= +This is a conflict!!! +>>>>>>> branch diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/conflicts-two.txt b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/conflicts-two.txt new file mode 100644 index 00000000..e62cac5c --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/conflicts-two.txt @@ -0,0 +1,5 @@ +<<<<<<< HEAD +This is without question another conflict! +======= +This is another conflict!!! +>>>>>>> branch diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/COMMITMESSAGE b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/COMMITMESSAGE new file mode 100644 index 00000000..7c4d1f5a --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/COMMITMESSAGE @@ -0,0 +1,5 @@ +Merge branch 'branch' + +Conflicts: + conflicts-one.txt + conflicts-two.txt diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/COMMIT_EDITMSG b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/COMMIT_EDITMSG new file mode 100644 index 00000000..1f7391f9 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/COMMIT_EDITMSG @@ -0,0 +1 @@ +master diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/HEAD b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_HEAD b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_HEAD new file mode 100644 index 00000000..a5bdf6e4 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_HEAD @@ -0,0 +1 @@ +e2809157a7766f272e4cfe26e61ef2678a5357ff diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MODE b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MODE new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MODE diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MSG b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MSG new file mode 100644 index 00000000..7c4d1f5a --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MSG @@ -0,0 +1,5 @@ +Merge branch 'branch' + +Conflicts: + conflicts-one.txt + conflicts-two.txt diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/ORIG_HEAD b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/ORIG_HEAD new file mode 100644 index 00000000..13d4d672 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/ORIG_HEAD @@ -0,0 +1 @@ +3a34580a35add43a4cf361e8e9a30060a905c876 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/config b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/config new file mode 100644 index 00000000..af107929 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/config @@ -0,0 +1,6 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/index b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/index Binary files differnew file mode 100644 index 00000000..ba4acf10 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/index diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/info/exclude b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/info/exclude new file mode 100644 index 00000000..a5196d1b --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD new file mode 100644 index 00000000..a385da67 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371828 -0500 commit (initial): initial +9a05ccb4e0f948de03128e095f39dae6976751c5 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371835 -0500 checkout: moving from master to branch +9a05ccb4e0f948de03128e095f39dae6976751c5 e2809157a7766f272e4cfe26e61ef2678a5357ff Edward Thomson <ethomson@edwardthomson.com> 1351371872 -0500 commit: branch +e2809157a7766f272e4cfe26e61ef2678a5357ff 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371873 -0500 checkout: moving from branch to master +9a05ccb4e0f948de03128e095f39dae6976751c5 3a34580a35add43a4cf361e8e9a30060a905c876 Edward Thomson <ethomson@edwardthomson.com> 1351372106 -0500 commit: master diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch new file mode 100644 index 00000000..26a5e8dc --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371835 -0500 branch: Created from HEAD +9a05ccb4e0f948de03128e095f39dae6976751c5 e2809157a7766f272e4cfe26e61ef2678a5357ff Edward Thomson <ethomson@edwardthomson.com> 1351371872 -0500 commit: branch diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master new file mode 100644 index 00000000..425f7bd8 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 9a05ccb4e0f948de03128e095f39dae6976751c5 Edward Thomson <ethomson@edwardthomson.com> 1351371828 -0500 commit (initial): initial +9a05ccb4e0f948de03128e095f39dae6976751c5 3a34580a35add43a4cf361e8e9a30060a905c876 Edward Thomson <ethomson@edwardthomson.com> 1351372106 -0500 commit: master diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/03/db1d37504ca0c4f7c26d7776b0e28bdea08712 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/03/db1d37504ca0c4f7c26d7776b0e28bdea08712 Binary files differnew file mode 100644 index 00000000..9232f79d --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/03/db1d37504ca0c4f7c26d7776b0e28bdea08712 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/17/0efc1023e0ed2390150bb4469c8456b63e8f91 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/17/0efc1023e0ed2390150bb4469c8456b63e8f91 Binary files differnew file mode 100644 index 00000000..3e124d9a --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/17/0efc1023e0ed2390150bb4469c8456b63e8f91 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1f/85ca51b8e0aac893a621b61a9c2661d6aa6d81 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1f/85ca51b8e0aac893a621b61a9c2661d6aa6d81 Binary files differnew file mode 100644 index 00000000..7bb19c87 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1f/85ca51b8e0aac893a621b61a9c2661d6aa6d81 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/22/0bd62631c8cf7a83ef39c6b94595f00517211e b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/22/0bd62631c8cf7a83ef39c6b94595f00517211e Binary files differnew file mode 100644 index 00000000..487bcffb --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/22/0bd62631c8cf7a83ef39c6b94595f00517211e diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/32/d55d59265db86dd690f0a7fc563db43e2bc6a6 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/32/d55d59265db86dd690f0a7fc563db43e2bc6a6 Binary files differnew file mode 100644 index 00000000..2eb3954f --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/32/d55d59265db86dd690f0a7fc563db43e2bc6a6 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/38/e2d82b9065a237904af4b780b4d68da6950534 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/38/e2d82b9065a237904af4b780b4d68da6950534 Binary files differnew file mode 100644 index 00000000..ebe83ccb --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/38/e2d82b9065a237904af4b780b4d68da6950534 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/3a/34580a35add43a4cf361e8e9a30060a905c876 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/3a/34580a35add43a4cf361e8e9a30060a905c876 new file mode 100644 index 00000000..0d4095ff --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/3a/34580a35add43a4cf361e8e9a30060a905c876 @@ -0,0 +1,2 @@ +xK +1D]}Dx/O"F2oo<*ZoљuIhhrl"r YT8'#vm0.¨.:.#+9R^nG~[=VjR"IjD۔7|N`
\ No newline at end of file diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/44/58b8bc9e72b6c8755ae456f60e9844d0538d8c b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/44/58b8bc9e72b6c8755ae456f60e9844d0538d8c Binary files differnew file mode 100644 index 00000000..33389c30 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/44/58b8bc9e72b6c8755ae456f60e9844d0538d8c diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/47/8871385b9cd03908c5383acfd568bef023c6b3 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/47/8871385b9cd03908c5383acfd568bef023c6b3 Binary files differnew file mode 100644 index 00000000..5361ea68 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/47/8871385b9cd03908c5383acfd568bef023c6b3 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/51/6bd85f78061e09ccc714561d7b504672cb52da b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/51/6bd85f78061e09ccc714561d7b504672cb52da Binary files differnew file mode 100644 index 00000000..a60da877 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/51/6bd85f78061e09ccc714561d7b504672cb52da diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/53/c1d95a01f4514b162066fc98564500c96c46ad b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/53/c1d95a01f4514b162066fc98564500c96c46ad Binary files differnew file mode 100644 index 00000000..85e84d71 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/53/c1d95a01f4514b162066fc98564500c96c46ad diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/6a/ea5f295304c36144ad6e9247a291b7f8112399 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/6a/ea5f295304c36144ad6e9247a291b7f8112399 Binary files differnew file mode 100644 index 00000000..b16b521e --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/6a/ea5f295304c36144ad6e9247a291b7f8112399 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/70/68e30a7f0090ae32db35dfa1e4189d8780fcb8 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/70/68e30a7f0090ae32db35dfa1e4189d8780fcb8 Binary files differnew file mode 100644 index 00000000..7c4e85ff --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/70/68e30a7f0090ae32db35dfa1e4189d8780fcb8 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/75/938de1e367098b3e9a7b1ec3c4ac4548afffe4 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/75/938de1e367098b3e9a7b1ec3c4ac4548afffe4 Binary files differnew file mode 100644 index 00000000..65173fc4 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/75/938de1e367098b3e9a7b1ec3c4ac4548afffe4 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/7b/26923aaf452b1977eb08617c59475fb3f74b71 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/7b/26923aaf452b1977eb08617c59475fb3f74b71 Binary files differnew file mode 100644 index 00000000..162fa445 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/7b/26923aaf452b1977eb08617c59475fb3f74b71 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/84/af62840be1b1c47b778a8a249f3ff45155038c b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/84/af62840be1b1c47b778a8a249f3ff45155038c Binary files differnew file mode 100644 index 00000000..77a519f5 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/84/af62840be1b1c47b778a8a249f3ff45155038c diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/88/71f7a2ee3addfc4ba39fbd0783c8e738d04cda b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/88/71f7a2ee3addfc4ba39fbd0783c8e738d04cda Binary files differnew file mode 100644 index 00000000..f624cd4f --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/88/71f7a2ee3addfc4ba39fbd0783c8e738d04cda diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/88/7b153b165d32409c70163e0f734c090f12f673 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/88/7b153b165d32409c70163e0f734c090f12f673 Binary files differnew file mode 100644 index 00000000..096474c0 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/88/7b153b165d32409c70163e0f734c090f12f673 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8a/ad34cc83733590e74b93d0f7cf00375e2a735a b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8a/ad34cc83733590e74b93d0f7cf00375e2a735a Binary files differnew file mode 100644 index 00000000..a413bc6b --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8a/ad34cc83733590e74b93d0f7cf00375e2a735a diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/3f43d2402825c200f835ca1762413e386fd0b2 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/3f43d2402825c200f835ca1762413e386fd0b2 Binary files differnew file mode 100644 index 00000000..3ac8f601 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/3f43d2402825c200f835ca1762413e386fd0b2 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/72416545c7e761b64cecad4f1686eae4078aa8 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/72416545c7e761b64cecad4f1686eae4078aa8 Binary files differnew file mode 100644 index 00000000..589a5ae9 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/72416545c7e761b64cecad4f1686eae4078aa8 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8f/3c06cff9a83757cec40c80bc9bf31a2582bde9 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8f/3c06cff9a83757cec40c80bc9bf31a2582bde9 Binary files differnew file mode 100644 index 00000000..6503985e --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8f/3c06cff9a83757cec40c80bc9bf31a2582bde9 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8f/fcc405925511824a2240a6d3686aa7f8c7ac50 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8f/fcc405925511824a2240a6d3686aa7f8c7ac50 Binary files differnew file mode 100644 index 00000000..2eaa8083 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8f/fcc405925511824a2240a6d3686aa7f8c7ac50 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9a/05ccb4e0f948de03128e095f39dae6976751c5 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9a/05ccb4e0f948de03128e095f39dae6976751c5 new file mode 100644 index 00000000..7373a80d --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9a/05ccb4e0f948de03128e095f39dae6976751c5 @@ -0,0 +1 @@ +x
!Dm@c6q##Ay/ ܁:#$ltH:闄*DXhV}
˷n[-K_;Z@JGԈbq3"go@I
\ No newline at end of file diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9d/81f82fccc7dcd7de7a1ffead1815294c2e092c b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9d/81f82fccc7dcd7de7a1ffead1815294c2e092c Binary files differnew file mode 100644 index 00000000..c5a651f9 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9d/81f82fccc7dcd7de7a1ffead1815294c2e092c diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/b7/cedb8ad4cbb22b6363f9578cbd749797f7ef0d b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/b7/cedb8ad4cbb22b6363f9578cbd749797f7ef0d Binary files differnew file mode 100644 index 00000000..3e14b5dc --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/b7/cedb8ad4cbb22b6363f9578cbd749797f7ef0d diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/d0/1885ea594926eae9ba5b54ad76692af5969f51 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/d0/1885ea594926eae9ba5b54ad76692af5969f51 Binary files differnew file mode 100644 index 00000000..a641adc2 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/d0/1885ea594926eae9ba5b54ad76692af5969f51 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e2/809157a7766f272e4cfe26e61ef2678a5357ff b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e2/809157a7766f272e4cfe26e61ef2678a5357ff new file mode 100644 index 00000000..fa86662e --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e2/809157a7766f272e4cfe26e61ef2678a5357ff @@ -0,0 +1,3 @@ +xK +1D]t> xNq1(]{Pe
mٍ.S0[Dcd +ŅbMԝCgd@>glX].$!0*zu})/E_<ڪO:WځrơqѤh@mt;;5uZyVo\M
\ No newline at end of file diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e6/2cac5c88b9928f2695b934c70efa4285324478 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e6/2cac5c88b9928f2695b934c70efa4285324478 Binary files differnew file mode 100644 index 00000000..c9841c69 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e6/2cac5c88b9928f2695b934c70efa4285324478 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/f7/2784290c151092abf04ce6b875068547f70406 b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/f7/2784290c151092abf04ce6b875068547f70406 Binary files differnew file mode 100644 index 00000000..cd587dbe --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/f7/2784290c151092abf04ce6b875068547f70406 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/branch b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/branch new file mode 100644 index 00000000..a5bdf6e4 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/branch @@ -0,0 +1 @@ +e2809157a7766f272e4cfe26e61ef2678a5357ff diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/master b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/master new file mode 100644 index 00000000..13d4d672 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/master @@ -0,0 +1 @@ +3a34580a35add43a4cf361e8e9a30060a905c876 diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/one.txt b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/one.txt new file mode 100644 index 00000000..75938de1 --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/one.txt @@ -0,0 +1,10 @@ +This is file one! +This is file one. +This is file one. +This is file one. +This is file one. +This is file one. +This is file one. +This is file one. +This is file one. +This is file one! diff --git a/LibGit2Sharp.Tests/Resources/mergedrepo_wd/two.txt b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/two.txt new file mode 100644 index 00000000..7b26923a --- /dev/null +++ b/LibGit2Sharp.Tests/Resources/mergedrepo_wd/two.txt @@ -0,0 +1,12 @@ +This is file two! +This is file two. +This is file two. +This is file two. +This is file two. +This is file two. +This is file two. +This is file two. +This is file two. +This is file two. +This is file two. +This is file two! diff --git a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs index 30335007..f7e42049 100644 --- a/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs +++ b/LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs @@ -21,6 +21,7 @@ namespace LibGit2Sharp.Tests.TestHelpers public static string BareTestRepoPath { get; private set; } public static string StandardTestRepoWorkingDirPath { get; private set; } public static string StandardTestRepoPath { get; private set; } + public static string MergedTestRepoWorkingDirPath { get; private set; } public static DirectoryInfo ResourcesDirectory { get; private set; } public static readonly Signature DummySignature = new Signature("Author N. Ame", "him@there.com", TruncateSubSeconds(DateTimeOffset.Now)); @@ -48,11 +49,14 @@ namespace LibGit2Sharp.Tests.TestHelpers BareTestRepoPath = Path.Combine(ResourcesDirectory.FullName, "testrepo.git"); StandardTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "testrepo_wd"); StandardTestRepoPath = Path.Combine(StandardTestRepoWorkingDirPath, ".git"); + MergedTestRepoWorkingDirPath = Path.Combine(ResourcesDirectory.FullName, "mergedrepo_wd"); // The test repo under source control has its .git folder renamed to dot_git to avoid confusing git, // so we need to rename it back to .git in our copy under the target folder string tempDotGit = Path.Combine(StandardTestRepoWorkingDirPath, "dot_git"); Directory.Move(tempDotGit, StandardTestRepoPath); + tempDotGit = Path.Combine(MergedTestRepoWorkingDirPath, "dot_git"); + Directory.Move(tempDotGit, Path.Combine(MergedTestRepoWorkingDirPath, ".git")); } protected void CreateCorruptedDeadBeefHead(string repoPath) |