Hi guys,

I'm facing a big issue with the merge feature of the creation kit version control system.

We are multiple people working on the same mod and we have one person responsible for merging our work from time to time into our esm.

I provide quests, including dialogue topicInfo scripts, which I prefix in order to avoid messing up the user's script folder when installing.

So I have files like

_TIF__010064E5.pex
_TIF__010064E5.psc

which I provide along with my esp to the person in charge of merging, so that he merges the esp and add the new master and my scripts to the next release.


Now, since we've had some issues with the latest release, I'm trying to do the merge myself locally to try and debug our process.

So, I follow the tutorial http://www.creationkit.com/Version_control and I'm all setup, everything works perfectly.

There's only one issue, but it's pretty much what messed all our work : the TopicInfo fragment scripts get renamed when merging !

_TIF__010064E5.pex randomly becomes TIF__0100999E.pex
_TIF__010064E5.psc randomly becomes TIF__0100999E.psc

and we're once again in a situation where we could mess up with the user folder... Furthermore, if we don't provide TIF__0100999E.pex/psc, obviously the topic info is broken because the script code cannot load.

In the Version Control there's a Papyrus Scripts table but that is disabled (because it seems to need perforce, which is oviously not released with the CK), so maybe that's the culprit.

I've tried and look all over the internet for a solution but can't find anything, anyone knows about a workaround ?

I would really like to avoid having the person doing the merge rename all the topic info fragments, since there are a large number of them in every merge (ant the merge-master doesn't know about the details of all the things he merges).

thanks in advance for your help !

I am not quite sure what the problem is? Yes, the CK renames all fragments scripts (quests, as well as dialogue), because it basically owns them. Everyone should hand their scripts (source as well as pexes) along with their esps, to the person doing the merging. When the merge is done they can be sent the newly named scripts (and delete the old ones).

Keeping track of fragment scripts is easier if you have put a comment in the source saying which script fragment it applies to.

Hi,

The problem is I give for merge my esp and scripts with prefixed names and I would expect those names to be respected when merged. But the version controls automatically changes the names of the scripts and therefore we have to rename them again afterwards...

thanks.

PS :

do you mean quest or topic info ?

OK so I just thought : what if the script prefix setting worked in that context ? and it seems that it does.

So the process would be the following

1/ contributor sends esp and scripts to the merge-master
2/ merge masters copies esp to his data and scripts to data/scripts and data/scripts/source
3/ merge masters sets a script name prefix in the CK preferences
4/ do merge to master
5/ merge-master packages
a. updated esm
b. newly-created TIF scripts (latest created files found in data/scripts and data/scripts/source)
c. Scripts (other than TIF) provided by contributor (they are not renamed in the process)
6/ merge-master can clean his data/scripts and data/scripts/source folder because a lot of deadfiles are now living there [edit : not so sure they're still here, seems they are removed]

Both quest and topic scripts - they all get renamed. I haven't had the CK ignore my prefixes at all - but we do all use the same prefix.

If the script files (including source) are in the merger's data folder, the merge will rename them, not copy them, so you don't get as many old files as all that.

Hum....
I actually use a different prefix for every quest (I rename manually in the advanced tab, since general prefix is only 4 characters).

maybe if there's just one general prefix and both contributor and merger have the same set, then it behaves as you describe...