About Store Forum Documentation Contact
Donations:
345$/mo



Post Reply 
How to merge project?
Author Message
mizukami Offline
Member

Post: #1
How to merge project?
There are two projects. Original is same.
One is general developing. and another is experimentally project.
it developing each themselves.

near future.
if accept experimental at general project.
Code and resource files can merge by SVN.
then, How can care "Data" file?
(This post was last modified: 05-25-2016 03:40 AM by mizukami.)
05-25-2016 03:00 AM
Find all posts by this user Quote this message in a reply
Esenthel Offline
Administrator

Post: #2
RE: How to merge project?
Hello,

Please do not merge resource files using SVN / manual copying files.

There is a function to Compare 2 Projects at the main screen, select 2 and right-click \ compare.

   

This will compare elements that are present in both projects and display those that are different (the same element exists in both projects, but has some different data).

This will not display elements that are included only in one of the projects (if you created a new element in one project, but it doesn't exist in the other, it won't be displayed), however I will add this function for next release.

Once elements are displayed, you can:
-open the new project
-and new option "Select All" will show on the "Project Comparison" window:
   

Once you click "Select All",

Then you can Right-click on elements on the left side, and do "Copy To Another Project"

This will replace the elements in the target project.
This does not perform synchronization (like on Esenthel Server), but just replaces destination with source files.
So if you made a change on destination project to one of the elements, it will be lost and replaced by the element from the source project.

Instead of working on 2 projects (stable and experimental), I'd rather encourage to keep all files in 1 project.

You can create a folder with the name "Experimental", and "Disable its Publishing", and create all game assets that are work in progress inside of that folder.
05-25-2016 05:49 AM
Find all posts by this user Quote this message in a reply
Esenthel Offline
Administrator

Post: #3
RE: How to merge project?
I will add this option for next release:
Quote:-Project Comparison now has the option to display all elements that exist in one project, but don't exist in the other one
05-25-2016 06:15 AM
Find all posts by this user Quote this message in a reply
Esenthel Offline
Administrator

Post: #4
RE: How to merge project?
I've created this documentation page for you:
http://www.esenthel.com/?id=doc#Comparing_Projects
05-25-2016 06:52 AM
Find all posts by this user Quote this message in a reply
mizukami Offline
Member

Post: #5
RE: How to merge project?
Two projects, example named project A, B. Also original is same.
A and B are little different project. and engineers are in each project.

Project A is developing function X.
Project B is developing function Y.

near future. these projects will merged.
then, i want to merge automatically in something way.
# like SVN branch/merge, or editing "Data".
(This post was last modified: 05-26-2016 02:10 AM by mizukami.)
05-25-2016 07:24 AM
Find all posts by this user Quote this message in a reply
mizukami Offline
Member

Post: #6
RE: How to merge project?
Or, if i can export resource index of project (Perhaps is in "Data" file), its resolved.

example:
Export project A's index, and import it into project B. then "Data" will synchronized.
and real resource file syncs by SVN.

not smart, i know.
but in present situation (present function), its difficult for us.
05-25-2016 08:59 AM
Find all posts by this user Quote this message in a reply
mizukami Offline
Member

Post: #7
RE: How to merge project?
if difficult, please let us know the format of "Data" file, at minimum.
05-31-2016 03:19 AM
Find all posts by this user Quote this message in a reply
Post Reply