|
Post by finrau on Feb 11, 2011 2:13:30 GMT -5
From my experience its not possible. Its the inherently a local only merge do to the fact that you may have text conflicts, and those cannot be resolved server side. So the normal procedure is to merge locally and recommit to your selected branch or branch/switch to trunk and commit.
|
|
|
Post by zenzou on Feb 11, 2011 2:25:19 GMT -5
Okay then. I'm pretty much set until something comes up lol.
|
|
|
Post by zenzou on Feb 11, 2011 22:33:21 GMT -5
Daisy, if you can, please to try add notation of what was changed when you commit. There should be an edit box when you select what to commit.
|
|
|
Post by daisy_strike on Feb 11, 2011 23:14:05 GMT -5
will do
Daisy
|
|
|
Post by irrbloss on Feb 18, 2011 13:07:50 GMT -5
I've proof-read gametext.as and have some low-key suggestions for improvements. However, the unified diff is ~1800 lines and I don't relish posting that on these boards. I could make the contribution via subversion if you like (I signed up at sourceforge as "irrbloss"). The code was pulled from trunk after revision 12.
|
|
|
Post by daisy_strike on Feb 26, 2011 19:49:56 GMT -5
Downloading the SVN is open to everyone.
To get rights to upload and commit to the SVN you must first have created a patch a change and had it vetted by one of the people in charge of the SVN.
The reason behind this is simple. You have to show that you know how to make changes before we give you permission to make changes. This should also stop people from trying to trash everyone else's work. As it would require them to actually work first before getting access.
Daisy
|
|
|
Post by daisy_strike on Feb 27, 2011 22:16:17 GMT -5
Okay I have another SVN question. Now that the trunk has has changed and been merged together with Docclox's and my code. My branch is out of the date. Do I just copy and paste replacing the files in my branch? But i'm afraid that will mess up the inheritance, which was the main issue I had with the last merge. Is there a command on Tortoise that will just update my branch to the current trunk?
Daisy
|
|
|
Post by cerion on Mar 8, 2011 7:53:30 GMT -5
|
|
|
Post by docclox on Mar 8, 2011 9:10:19 GMT -5
my apologies - I thought I'd fixed that I think you can still build - but I'll fix that now [edit] Try now.
|
|
reme
New Member
Posts: 3
|
Post by reme on Mar 31, 2011 13:47:56 GMT -5
Over an' over an' over an' over ;_;
|
|
|
Post by daisy_strike on Mar 31, 2011 15:19:18 GMT -5
|
|
reme
New Member
Posts: 3
|
Post by reme on Mar 31, 2011 16:10:05 GMT -5
<3!
|
|
|
Post by cerion on Apr 3, 2011 6:17:10 GMT -5
Sorry but where is generic.xml, or how do you make one?
|
|
|
Post by soloversia on Apr 3, 2011 9:06:03 GMT -5
There is one otherworld\lab\generic_girl
|
|
|
Post by delete13 on Apr 26, 2011 5:12:41 GMT -5
Got error. Attachment show the error. By the way i use windows 7 64 bit. Maybe it's because my windows incase sensitive. could you fix this? To rename to another name? Attachments:
|
|