From e1e32155defc825f3c5edfa40ae9dec3a42b34da Mon Sep 17 00:00:00 2001
From: donghee yang <donghee.yang@samsung.com>
Date: Sat, 8 Sep 2012 04:44:22 +0900
Subject: [PATCH] [Title] Fixed a bug that resolving conflict using remote
 server doest not work

---
 package/build.macos          | 2 +-
 package/build.windows        | 2 +-
 package/pkginfo.manifest     | 9 ++-------
 src/build_server/BuildJob.rb | 4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package/build.macos b/package/build.macos
index 1f91da9..05ef573 100755
--- a/package/build.macos
+++ b/package/build.macos
@@ -16,7 +16,7 @@ build()
 install() 
 {
 	BIN_DIR=$SRCDIR/package/dibs.package.${TARGET_OS}/data/tools/dibs/
-	DOC_DIR=$SRCDIR/package/dibs.package.${TARGET_OS}/data/tools/dibs/doc
+	DOC_DIR=$SRCDIR/package/dibs.package.${TARGET_OS}/data/documents
 	mkdir -p $BIN_DIR
 	mkdir -p $DOC_DIR
 	cp -f $SRCDIR/pkg-* $BIN_DIR/
diff --git a/package/build.windows b/package/build.windows
index 1f91da9..05ef573 100755
--- a/package/build.windows
+++ b/package/build.windows
@@ -16,7 +16,7 @@ build()
 install() 
 {
 	BIN_DIR=$SRCDIR/package/dibs.package.${TARGET_OS}/data/tools/dibs/
-	DOC_DIR=$SRCDIR/package/dibs.package.${TARGET_OS}/data/tools/dibs/doc
+	DOC_DIR=$SRCDIR/package/dibs.package.${TARGET_OS}/data/documents
 	mkdir -p $BIN_DIR
 	mkdir -p $DOC_DIR
 	cp -f $SRCDIR/pkg-* $BIN_DIR/
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index fee0bce..b79d956 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,13 +1,8 @@
 Source : dibs
-Version :1.0.4
+Version :1.0.5
 Maintainer : taejun ha<taejun.ha@samsung.com>, jiil hyoun <jiil.hyoun@samsung.com>, donghyuk yang <donghyouk.yang@samsung.com>, donghee yang <donghee.yang@samsung.com>, sungmin kim <dev.sungmin.kim@samsung.com
 
 Package : dibs
-OS : ubuntu-32, windows-32, windows-64, macos-64
+OS : ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 Build-host-os : ubuntu-32
 Description : Distribute Inteligent Build System
-
-Package : dibs
-OS : ubuntu-64
-Build-host-os : ubuntu-64
-Description : Distribute Inteligent Build System
diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index f6a99b6..223d752 100644
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -902,7 +902,7 @@ class BuildJob
 		# build 
 		if @is_remote_job then
 			result = builder.build(@project.repository, @source_path, @os, 
-				false, @git_commit, [])
+				false, @git_commit, @no_reverse, [])
 		else
         	result =  builder.build(@source_path, @os, true, [], false )
 		end
@@ -1002,7 +1002,7 @@ class BuildJob
 		# build
 		if @is_remote_job then
 			result = builder.build(@project.repository, @source_path, @os,
-				false, @git_commit,  local_pkgs)
+				false, @git_commit, @no_reverse, local_pkgs)
 		else
 			result = builder.build(@source_path, @os, true, local_pkgs, false )
 		end
-- 
2.34.1