incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [2/3] git commit: [#6229] add merge commit to test data
Date Thu, 05 Sep 2013 15:11:14 GMT
[#6229] add merge commit to test data


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/39b6d205
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/39b6d205
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/39b6d205

Branch: refs/heads/db/6629
Commit: 39b6d205dafd241b9105c258d4ca404b905f4c4f
Parents: 562b3f3
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Thu Sep 5 14:55:31 2013 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Thu Sep 5 14:55:31 2013 +0000

----------------------------------------------------------------------
 .../objects/13/951944969cf45a701bf90f83647b309815e6d5 |   2 ++
 .../objects/65/3667b582ef2950c1954a0c7e1e8797b19d778a |   3 +++
 .../objects/6b/0bbf7169927069f7839b682307ec4ecb85c2e9 | Bin 0 -> 56 bytes
 .../objects/d4/99ed2dc5606d4d0953937bca92157743df79ab | Bin 0 -> 77 bytes
 .../tests/data/testrename.git/refs/heads/master       |   2 +-
 5 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/39b6d205/ForgeGit/forgegit/tests/data/testrename.git/objects/13/951944969cf45a701bf90f83647b309815e6d5
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/testrename.git/objects/13/951944969cf45a701bf90f83647b309815e6d5
b/ForgeGit/forgegit/tests/data/testrename.git/objects/13/951944969cf45a701bf90f83647b309815e6d5
new file mode 100644
index 0000000..49fdaba
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/testrename.git/objects/13/951944969cf45a701bf90f83647b309815e6d5
@@ -0,0 +1,2 @@
+x���JA�=�S�A�?��C����`oKO��; {�SQ|�[�L�)��a��L�J.�hRG9R�*L�g�uC�|�널IU����ȫ���\$%��y+���_r,k^�m��O9�4o+VO����_�������Wݭ1<j���������L/�
�=���F
+�ݑ�X�i�-o6�
~yp���i���io
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/39b6d205/ForgeGit/forgegit/tests/data/testrename.git/objects/65/3667b582ef2950c1954a0c7e1e8797b19d778a
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/testrename.git/objects/65/3667b582ef2950c1954a0c7e1e8797b19d778a
b/ForgeGit/forgegit/tests/data/testrename.git/objects/65/3667b582ef2950c1954a0c7e1e8797b19d778a
new file mode 100644
index 0000000..bf8f5c9
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/testrename.git/objects/65/3667b582ef2950c1954a0c7e1e8797b19d778a
@@ -0,0 +1,3 @@
+x��A
+�0E]��J21�DD�H&��`�����m���z���?�Z�
+Hf���q�#��8�:3H�I��3J�i��[4��D�e�c'�} ,,a���.=��&8���ij�2KM�/���|K�4�R��ϭ��u)ؚ%��.wU�-��F����
F�R���S�
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/39b6d205/ForgeGit/forgegit/tests/data/testrename.git/objects/6b/0bbf7169927069f7839b682307ec4ecb85c2e9
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/testrename.git/objects/6b/0bbf7169927069f7839b682307ec4ecb85c2e9
b/ForgeGit/forgegit/tests/data/testrename.git/objects/6b/0bbf7169927069f7839b682307ec4ecb85c2e9
new file mode 100644
index 0000000..7e24884
Binary files /dev/null and b/ForgeGit/forgegit/tests/data/testrename.git/objects/6b/0bbf7169927069f7839b682307ec4ecb85c2e9
differ

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/39b6d205/ForgeGit/forgegit/tests/data/testrename.git/objects/d4/99ed2dc5606d4d0953937bca92157743df79ab
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/testrename.git/objects/d4/99ed2dc5606d4d0953937bca92157743df79ab
b/ForgeGit/forgegit/tests/data/testrename.git/objects/d4/99ed2dc5606d4d0953937bca92157743df79ab
new file mode 100644
index 0000000..cdd9526
Binary files /dev/null and b/ForgeGit/forgegit/tests/data/testrename.git/objects/d4/99ed2dc5606d4d0953937bca92157743df79ab
differ

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/39b6d205/ForgeGit/forgegit/tests/data/testrename.git/refs/heads/master
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/data/testrename.git/refs/heads/master b/ForgeGit/forgegit/tests/data/testrename.git/refs/heads/master
index e83ab53..a0aeefb 100644
--- a/ForgeGit/forgegit/tests/data/testrename.git/refs/heads/master
+++ b/ForgeGit/forgegit/tests/data/testrename.git/refs/heads/master
@@ -1 +1 @@
-259c77dd6ee0e6091d11e429b56c44ccbf1e64a3
+13951944969cf45a701bf90f83647b309815e6d5


Mime
View raw message