About Store Forum Documentation Contact
Donations:
309$/mo



Post Reply 
How can I merge svn branches to trunk on concurrent development?
Author Message
takashi Offline
Member

Post: #1
How can I merge svn branches to trunk on concurrent development?
Hi,

I'm developing concurrently a project with svn branches, but found it difficlut to merge branches. What I want to do is

branchB
+-----o-----o-----o---+
| \
| \ merging branchB fails!
trunk --+---------+----------+-------------+-------------->
| / merging branckA succeeds
| /
+----o-----o------+
branchA

(See attached image file if the above figure is corrupted...)

1) Create new branch "branchA" from trunk.
2) Put some commits to branchA.
3) Create new branch "branckB" from trunk.
4) Put some commits to branchB
5) Merge branchA to trunk. It succeeds.
6) Merge branchB to trunk. It FAILS due to conflict!

I suppose it happens because svn cannot recoginze sources and resources differences which are encrypted by Esenthel Engine. This problem couldn't be resolved by Collaborative Mode or project compare option. Since my project contains a lot of sources and resources, it's impractical to compare files and merge their diffs by manually. How can I resolve such a conflict?

Thanks in advance.


Attached File(s) Image(s)
   
(This post was last modified: 06-01-2016 08:41 AM by takashi.)
06-01-2016 08:40 AM
Find all posts by this user Quote this message in a reply
Esenthel Offline
Administrator

Post: #2
RE: How can I merge svn branches to trunk on concurrent development?
Hello and welcome to the Forum,

Projects were designed to be synchronized using "Esenthel Server" application, and not SVN.

You can synchronize your assets (everything except codes) as described here:
http://www.esenthel.com/?id=doc#Collabor...evelopment

You can synchronize your source codes as described here, using the External Code Synchronization (SVN):
http://www.esenthel.com/?id=doc#Synchronizing_Codes
Code:
Sample Usage:
Use the "Export" option to save your Codes into text files on your disk
Use a 3rd Party Tools (SVN) to synchronize these files
Use the "Import" option to load your Codes from synchronized files back to your Project

If you encounter any issues with the above process, please let me know.

Quote:I suppose it happens because svn cannot recoginze sources and resources differences which are encrypted by Esenthel Engine.
The files are not encrypted, but they are stored in binary format, which SVN doesn't know how to synchronize.
06-02-2016 01:20 AM
Find all posts by this user Quote this message in a reply
takashi Offline
Member

Post: #3
RE: How can I merge svn branches to trunk on concurrent development?
Hi Administrator,

Thanks for your reply.
I understood that it's designed to use Esenthel Server for sync.
However, even if I use Esenthel Server, it isn't suit for concurrent development.

As alternative, can I export Data file to text or xml or something?
If it's possible, it will be useful for other Esenthel user and Esenthel Engine will be more attractive.

cheers!
06-02-2016 02:26 AM
Find all posts by this user Quote this message in a reply
Esenthel Offline
Administrator

Post: #4
RE: How can I merge svn branches to trunk on concurrent development?
Hello,

Quote:However, even if I use Esenthel Server, it isn't suit for concurrent development.
I'd be interested to hear why Esenthel Server Collaborative development combined with SVN Code Synchronization is not a good solution for you.

Quote:As alternative, can I export Data file to text or xml or something?
Adding this kind of feature would require making a payment.
I'd have to analyze how much work would that require.
06-02-2016 04:56 AM
Find all posts by this user Quote this message in a reply
takashi Offline
Member

Post: #5
RE: How can I merge svn branches to trunk on concurrent development?
Hi,

Attached file is an example of my team's branch operation. We are developing online game, so we need to provide hotfix and new download contents while developing. Do you have any idea to manage such a complex patching process with Esenthel Server?

BTW, when you finish to analyze how much work would be required for Data export function, let me know.

Thanks.


Attached File(s) Image(s)
   
06-02-2016 07:51 AM
Find all posts by this user Quote this message in a reply
Esenthel Offline
Administrator

Post: #6
RE: How can I merge svn branches to trunk on concurrent development?
Hi,

The codes can be synchronized using SVN as described here:
http://www.esenthel.com/?id=doc#Synchronizing_Codes

So the only problem lies with synchronizing Assets.

For new assets that aren't yet available in previous game releases, you can easily solve the problem by creating a "Folder" element, you can call it for example "Work in Progress", and right-click and "disable publishing".
Keep inside that folder all new elements that are still in development.
Once assets get ready for release from this folder, you can move it to another folder, for example called "Ready for Testing".

As for modifying existing assets, that are present in previous releases, that depends on the type of the asset.
For some assets, you can "Copy" that asset to a new temporary element, also disable its publishing, and add "for next version" to its name. Once element becomes ready for release, you could update the original element to be the same as the modified version.

Or another idea, is to connect to Esenthel Server and synchronize the changes, only when updating the element to latest version / changes has been completed fully.

As for storing Project's "Data" file in text format, I will send you a private message about the cost.

Thank you
06-02-2016 09:20 AM
Find all posts by this user Quote this message in a reply
Esenthel Offline
Administrator

Post: #7
RE: How can I merge svn branches to trunk on concurrent development?
I've just sent you a Private Message on the forum.
06-02-2016 09:41 AM
Find all posts by this user Quote this message in a reply
Post Reply