Anyone using version control? help needed.

Post » Tue Jun 19, 2012 7:55 pm

Despite a lot of patience from Maegfaer, I am struggling to get version control to do merge esp to master. I can get the esp to show up, get version control to work, it creates the files where they are supposed to be in the merging/data folder but for some obscure reason it cannot find the master file to merge into on the network.
User avatar
George PUluse
 
Posts: 3486
Joined: Fri Sep 28, 2007 11:20 pm

Post » Tue Jun 19, 2012 5:14 pm

Your not even telling us which VCS you are using :ermm:.

Besides that, I use Mercurial, but I haven't tried to merge esp's - binary data.
I wouldn't expect that to work, especially not with a self referencing binary format.

So, I just use it for scripts, for anything else I'd wager we need the full CK and Perforce, or am I missing something?
User avatar
helliehexx
 
Posts: 3477
Joined: Fri Jun 30, 2006 7:45 pm

Post » Wed Jun 20, 2012 4:00 am

No idea what perforce is, I always get a, not runiung perforce kind of error on starting up but vc works without it anyway. (i think)
User avatar
Sammygirl500
 
Posts: 3511
Joined: Wed Jun 14, 2006 4:46 pm

Post » Wed Jun 20, 2012 7:21 am

So, I just use it for scripts, for anything else I'd wager we need the full CK and Perforce, or am I missing something?
SkyrimEditor.ini;
[General]bUseVersionControl=1

This activates what remains of Bethesda's version control features allowing the developers to add their work into Skyrim.esm.

The problem is that we a) have no documentation of the features and b ) don't know if they still marginally work in our version of the CK.
User avatar
Cagla Cali
 
Posts: 3431
Joined: Tue Apr 10, 2007 8:36 am

Post » Wed Jun 20, 2012 6:51 am

JOB
Ah I see, that's certainly interesting!

Although I have never worked with the http://www.perforce.com/ VCS.
To get the VC integration in the CK working, we probably need Perforce or find out how it integrates, fake that, and then fake whatever API there is, and use another - free - VCS in its place.
All which might not be legal?
User avatar
Dominic Vaughan
 
Posts: 3531
Joined: Mon May 14, 2007 1:47 pm

Post » Tue Jun 19, 2012 11:38 pm

Best not done then. Back to the drawing board.
User avatar
Manuela Ribeiro Pereira
 
Posts: 3423
Joined: Fri Nov 17, 2006 10:24 pm

Post » Wed Jun 20, 2012 3:29 am

I've already merged 8 ESP plugins into our ESM files just fine, Version Control works perfectly once you figured it out. Perforce is not necessary to have. Thekarithian gets an error that it can't find the ESM file on the network, despite it being in the correct location and having set up the INI settings correctly. He has everything set up correctly, if he can make the CK see his network master he's ready to go.
User avatar
Nana Samboy
 
Posts: 3424
Joined: Thu Sep 14, 2006 4:29 pm

Post » Wed Jun 20, 2012 3:49 am

I've already merged 8 ESP plugins into our ESM files just fine, Version Control works perfectly once you figured it out.

Perhaps someone could make a (more or less) idiotproof wiki page on this. Version control seems to be the source of most of the so called bugs in this CK. I think Joel Burgess confirmed that.
User avatar
Mandi Norton
 
Posts: 3451
Joined: Tue Jan 30, 2007 2:43 pm

Post » Tue Jun 19, 2012 11:18 pm

I think my issue may be to do with network etc. Perhaps security settings and so forth, though I am guessing. I need to replicate what someone else has done step by step in setting it up to work.
User avatar
Lance Vannortwick
 
Posts: 3479
Joined: Thu Sep 27, 2007 5:30 pm

Post » Wed Jun 20, 2012 12:05 am

1. Load CK
2. Check mesogea.esm and skyrim.esm
3. Load both
4. Locate worldspace Mesogea and go to location 0,0
5. Open landscape editor and press to paint area some random ground texture to make something for a plugin
6. window opens:

(01A70FDF) was checked out by Family on 12/0/2011 but is not in the active plugin. DO you want to alter this object?

Click no and cant use the landscape editor
Click yes and the painted texture appears

7. Save plugin "test1"

8. Open version control and without touching anything, nothing is blue (selected etc) I go direct to "check out" and get this result:

http://img96.imageshack.us/img96/5875/test1yr.jpg
User avatar
Quick Draw
 
Posts: 3423
Joined: Sun Sep 30, 2007 4:56 am

Post » Wed Jun 20, 2012 3:00 am

Can you make a screenshot of your network folder where the master file is located?

Perhaps someone could make a (more or less) idiotproof wiki page on this. Version control seems to be the source of most of the so called bugs in this CK. I think Joel Burgess confirmed that.

Rather the lack of Version Control is a source of bugs. For Bethesda everything works fine with Version Control enabled, the fact that it's disabled by default in our CK causes bugs. For example I noticed that the heightmap editor actually is tied into Version Control, if you save heightfield quads with VC enabled it uses VC to save the LAND data straight into the network master. Without it, it tries to save locally into a ESP and that can bug out.
User avatar
louise fortin
 
Posts: 3327
Joined: Wed Apr 04, 2007 4:51 am

Post » Wed Jun 20, 2012 4:29 am

Its inside Merging/data is that correct? One minute, i'll do one.

http://img163.imageshack.us/img163/2452/folderdz.jpg

skyrimeditor.ini relevant bit

[General]
bUseVersionControl=1
SNetwork Path=\\FAMILY-PCMerging\
SNewVersionBackupPath=\\FAMILY-PC\Merging\VersionBackup\
SNetworkMasterPath=\\FAMILY-PC\Merging\Data\
bAllowMultipleMasterLoads=1


bUseMyGamesDirectory=0
SLocalSavePath=Saves\
SLocalMasterPath=Data\
SLocalBackupPath=Data\CheckInBackup


skyrimeditorprefs.ini relevant bit

[WhoCanMerge]
Family=1


Set up in network options, (click on little telly screen bottom right of desktop) open network and sharing centre

FAMILY-PC
----- Ntetwork name is "home" --------
(This computer)

home is under home network , status is joined in homegroup and local area connection



Under control panel users

current user Family (administrator)

----------------------------------

All right or wrong, beats me.
User avatar
Casey
 
Posts: 3376
Joined: Mon Nov 12, 2007 8:38 am

Post » Wed Jun 20, 2012 4:42 am

Rather the lack of Version Control is a source of bugs.

Yes, that's exactly what I wanted to say, thanks.
User avatar
Lizzie
 
Posts: 3476
Joined: Sun Nov 19, 2006 5:51 am

Post » Tue Jun 19, 2012 9:47 pm

I am probably doing something simple and obvious thats wrong, but cant see it. Ive messed with security settings and all kinds of things, but no joy still. Once I figure it (if ever) I will gladly do a walk-through video.

Is Kaspersky causing issues?
User avatar
victoria gillis
 
Posts: 3329
Joined: Wed Jan 10, 2007 7:50 pm

Post » Wed Jun 20, 2012 8:17 am

Add Skyrim.esm to the Merging/Data folder. Also keep ESP files out of it, they should be located only in your regular Data directory. Not sure if it helps, but you can try.
User avatar
Anthony Rand
 
Posts: 3439
Joined: Wed May 09, 2007 5:02 am

Post » Tue Jun 19, 2012 9:28 pm

Ok a step forward, it not longer gives the error.
Do I select all three entries with ctrl and left click? or not.

I select all three and click check out, then all three and click check in, then it comes up with a choice of masters,.

I select mesogea.esm and it says it will become dependent on skyrim.esm I click yes and it says, "correct answer is No, until we're working on DLC etc etc"

Hilfe, help

Screen with items I presume I select and check out, then reselect and check in: http://img99.imageshack.us/img99/3752/checkout1.jpg

It then waits a bit and shows me a box with the skyrim.esm and mesogea.esm

I select mesogea.esm and it says do I want it to become dependent on skyrim.esm, I get this:
http://img141.imageshack.us/img141/7170/futile.jpg

If I click "no" it stops at that point

if I click yes I get

"Sorry until we're working on DLC the correct answer is no."

As far as I can get this time.
User avatar
Nicholas C
 
Posts: 3489
Joined: Tue Aug 07, 2007 8:20 am

Post » Wed Jun 20, 2012 1:37 am

Help
User avatar
Allison C
 
Posts: 3369
Joined: Mon Dec 18, 2006 11:02 am

Post » Wed Jun 20, 2012 9:30 am

Yes I had that too, you need to make it dependant on Skyrim.esm manually. You can do this with TesVSnip, as long as you do the following to enable compression:

You can enable compression from the Options | Compression Settings... and check the "Use Default Compression" before importing and exporting. (looks like bug in my code that means you might have to edit the tesvsnip.exe.config file (open with notepad, Maeg) and change UseDefaultRecordCompression to True to make that stick)

If you can't figure it out, upload Mesogea.esm for me and I'll make it dependant on Skyrim.esm and send it back. After this Version Control will work.
User avatar
Katy Hogben
 
Posts: 3457
Joined: Mon Oct 30, 2006 12:20 am

Post » Wed Jun 20, 2012 7:02 am

Will it work if I make it dependent with wyrebash? I'll use tesvsnip and give it a go. Might as well, as Im on a roll ;)
User avatar
Travis
 
Posts: 3456
Joined: Wed Oct 24, 2007 1:57 am

Post » Wed Jun 20, 2012 4:37 am

Oh yes, Wrye Bash will work as well. Forgot about that one for a moment.
User avatar
Emma
 
Posts: 3287
Joined: Mon Aug 28, 2006 12:51 am

Post » Tue Jun 19, 2012 9:30 pm

Great, I used it previously so will try it again. If I can get this sorted and get merges working, then I am well forward. The only difficulty I hit is knowing what to do on the version control screen. Just let me know if this is how to do it:

Open version control, this contains three items, I think they are WRLD, CELL and LAND. I keep altered checked on the bottom right corner. I then select the three items as shown on the screen: http://img99.imageshack.us/img99/3752/checkout1.jpg.

I select all three by ctrl and mouse click. Then click Check Out. I then select all three again, ctrl and mouse, then click "Check In" the blue selection bars disappear but then the master file selection pops up. (which hopefully wyre will sort out - though the path of my life is strewn with the cowpats of the devils own satanic herd, to coin a BlackAdder line, so no doubt I will struggle again somewhere further along)
User avatar
megan gleeson
 
Posts: 3493
Joined: Wed Feb 07, 2007 2:01 pm

Post » Tue Jun 19, 2012 7:58 pm

You're doing it right. An easier way of selection is using Shift + Click though, if you have many forms (which you will, later). The 4 buttons (Altered, My Owned, All, All Checked Out) are just display filters. Altered shows the forms that your current active ESP has edited, My Owned shows all forms that you checked out. All Checked Out I think shows all forms that are checked out by other users (who don't exist, so this button is useless) and All simply shows all forms of all loaded ESM/ESP files.

I usually select all forms that I want to merge in Altered using Shift + Click, then Check Out, then switch to My Owned where all my Check Out forms are displayed. There I simply click the Select All button, and then choose Check In. I select my ESM of choice, and then choose No when it asks if I want to use a Check In Data file (This is practically only used when you check in the contents of a ESP in multiple sessions, you can and should usually avoid doing so), and then it merges. Restart the CK, it will say your local ESM is outdated, press Yes to make it copy the updated Network ESM, and there you are.
User avatar
Cody Banks
 
Posts: 3393
Joined: Thu Nov 22, 2007 9:30 am

Post » Wed Jun 20, 2012 1:52 am

So far so good, now to try playing and saving etc. Do you sometimes get the message about a file having been checked in etc when making a change, or somesuch similar thing? I
User avatar
cheryl wright
 
Posts: 3382
Joined: Sat Nov 25, 2006 4:43 am

Post » Wed Jun 20, 2012 9:08 am

And finally works like a dream. Absolutely fantastic, no idea yet if I can save and go back in though, thats to be tested as soon as my son stops making silly villages in Oblivion and filling them with twenty foot goblins :blink: You think I am kidding... I aint.

If all goes well and the saves work etc, I am going to start a scratch to finish tutorial to go right from L3dt, tes Annwyn, Oscape, version control and to date as I think I have hit every possible snag in every program available.
User avatar
Emmi Coolahan
 
Posts: 3335
Joined: Wed Jan 24, 2007 9:14 pm

Post » Wed Jun 20, 2012 2:48 am

Oops, spoke too soon.

I went to try a save game etc. I decided to do a clean game from the point where some bloke gets his head chopped off at the start of the game. Loaded mesogea.esm (cant choose anything else in the new load screen) so presume skyrim.esm and update.esm are both loaded auto.

Dragon attack, leg it through the underground caverns etc, out I come and then wait until quest is over, unbound etc.

Ok, cow mesogea 0,0 I can find the location and the couple of trees etc I merged to master. Merge works fine.

Save, back out and go around Skyrim for a bit. Load the save game and end up back in Giants whatever Inn, not mesogea.

It might be wyre-bash that isnt doing something when it links mesogea.esm to skyrim.esm.

I will try tesvsnip. Meanwhile I will uploade mesogea.esm and if you wouldnt mind sticking it through the wash please Maegfaer.
This isnt the finished esm as I still have stuff to do in l3dt, but its intended for me to get a proofworked esm into the game.
User avatar
tiffany Royal
 
Posts: 3340
Joined: Mon Dec 25, 2006 1:48 pm

Next

Return to V - Skyrim