Times are UTC Toggle Colours
05:14:37 <Brot6> VAST Objects - Bug #4916 (New): Improper action colors XSupercheeseX @ http://dev.openttdcoop.org/issues/4916 07:45:50 *** ODM has joined #openttdcoop.devzone 09:07:37 *** Alberth has joined #openttdcoop.devzone 09:07:43 *** Supercheese has quit IRC 11:55:09 *** frosch123 has joined #openttdcoop.devzone 12:46:27 *** andythenorth has joined #openttdcoop.devzone 13:37:44 <George> Is there anybody here? 13:37:56 <George> I have a strange question :) 13:38:37 <Rubidium> you won't know until you open the iradiated box 13:39:13 <George> Is it possible to synhronise 2 repos? One on DevZone and one on BitBucket 13:39:59 <George> so a commit on repo goes to the other repo too 13:40:34 <George> and the same to the other direction 13:40:59 <Rubidium> I reckon you can push to both, but I wouldn't know how exactly how to do it (the manual does know though) 13:41:20 <frosch123> i don't think you can make it bidirectional 13:41:36 <frosch123> that would result in multiple heads 13:41:40 <frosch123> which you likely do not want 13:41:53 <frosch123> so i guess you have to decide for master/backup 13:42:21 <frosch123> and i believe there are several repos on the devzone which have some backup-repo somewhere 13:43:36 <George> The problem is that one user wants to use BitBucket repo while I want to use DevZone Repo 13:44:10 <George> The question is how to handle the project on 2 repos? 13:44:34 <Alberth> someone has to synchronize 13:44:46 <George> How? 13:45:02 <frosch123> you can pull from multiple locations 13:45:03 <Alberth> clone a devzone copy, and a bitbucket copy 13:45:09 <frosch123> then merge it locallly and push again 13:45:17 <George> For example, me on dev zone wants to sinchronize 13:45:21 <frosch123> there is no automatism 13:45:24 <George> how can I do it? 13:45:28 <frosch123> someone has to do it 13:45:42 <Alberth> ie you can pull from an arbitrary location, including another repo at the same machine 13:46:44 <Alberth> you can pull from any location and push to any location 13:46:50 <Alberth> in any order you like 13:47:11 <Alberth> inlcuding push/pull to/from 2 locations 13:48:16 <Alberth> Ammler: ^^ can you create some automagication here? 13:49:46 <Alberth> but in the general case, it won't work. If both repos are updated at the same time, you cannot update either, as you have to merge local changes with remote changes 13:53:13 <George> Does it mean, that if other users work with only one repo, and I push to both repos, than it would work fine? 13:55:12 <George> What should I specify in hgrc to push to both the repos? 13:56:25 <Alberth> hg is a distributed version system, you can have as many cloned copies as you like 13:57:25 <Alberth> push to several locations is not standard, I would think you have to manually give a destination to push to, each time 13:57:44 <Alberth> but I never really tried any of this 13:58:17 <Alberth> you can easily do some tests, just make a few clones at your local system, and commit, push and pull between them 13:59:37 <Alberth> you may also want to read some mercurial manual about distributed repositories, at least, I would expect that to exist 14:00:54 <George> [17:43:54] <frosch123> and i believe there are several repos on the devzone which have some backup-repo somewhere - what are they? May be there is a solution already 14:01:38 <Alberth> unlikely to work; the backup will assume the bitbucket repo does not contain new revisions 14:02:37 <Alberth> since that will break pushing (it needs to be handled manually, first pull the remote changes, then merge the changes, then push) 14:03:17 <Alberth> it'd be simpler if you don't want fully synchronized repos 14:03:58 <Alberth> then you can just every now and then synchronize with the 'other' repo manually 14:04:55 <Alberth> alternatively, you can see whether you can change something else so you can both work at the same repo 14:05:36 <Alberth> ie, fix at devzone the reason why he wants to work at bitbucket, or fix at bitbucket the reason why you want to work at devzone 14:11:05 <Alberth> http://paste.openttdcoop.org/show/2107/ is the basic idea. It is missing lots of details like the exact options and paths. You really should run some tests at your local system, for your understanding, but also to get the details right (locally it is much faster, and easier to try again) 15:05:17 <George> Seems like that works 15:05:34 <George> Now some questions on automatization 15:06:16 <George> Is it possible to configure tortosie UI to pull auplmatically from both the repos? 15:07:47 <George> I understand, that I can do it CMD, but configuring tortoise sounds a better solution 15:08:03 <George> Is that possible? 15:16:32 <Alberth> no idea, I'd write a script to do it (eg a .bat file) 15:16:32 <Brot6> Dutch Trains 2 - Bug #4919 (Assigned): Open Wagon L misallignment XTransportmanX @ http://dev.openttdcoop.org/issues/4919 15:17:11 <Alberth> gui applications are usually notoriously bad at automization (which is why I avoid them mostly) 15:33:23 <George> Thank you Alberth for your help, seems like I could do it with your help :) 15:33:39 <Alberth> ok :) 15:34:09 <Alberth> when you get changes from several repositories, things may break though 15:34:29 <Alberth> try to avoid working in the same files at the same time 15:34:52 <Alberth> then most issues are relatively easy to resolve 15:45:02 <Brot6> Dutch Trains 2 - Bug #4919 (Assigned): Open Wagon L misalignment XTransportmanX @ http://dev.openttdcoop.org/issues/4919 15:45:02 <Brot6> Dutch Trains 2 - Bug #4919: Open Wagon L misalignment XTransportmanX @ http://dev.openttdcoop.org/issues/4919#change-13262 15:52:04 <Brot6> Webtranslator - Revision 9:2229c03a4c74: Add: Create a new project, to allow deletion of the project... XAlberthX @ http://dev.openttdcoop.org/projects/eints/repository/revisions/2229c03a4c74 15:52:04 <Brot6> Webtranslator - Revision 10:ea1c8b9663e6: Add: More cases for uploading a translation file. XAlberthX @ http://dev.openttdcoop.org/projects/eints/repository/revisions/ea1c8b9663e6 16:25:43 <George> [19:47:55] <George> I do not know. What whould you suggest? - planetmaker - So, what do you suggest. What event should I use to forse GRF compilation? 16:53:37 *** Zuu has joined #openttdcoop.devzone 17:20:04 <Brot6> firs: update from r3380 to r3383 done (21 warnings) - http://bundles.openttdcoop.org/firs/nightlies/r3383 18:54:51 *** LordAro has joined #openttdcoop.devzone 19:18:33 <Brot6> Webtranslator - Revision 11:a9cf2607348c: Add: Upload translations. XAlberthX @ http://dev.openttdcoop.org/projects/eints/repository/revisions/a9cf2607348c 19:19:09 <Alberth> it may be useful to add pages for displaying the string :) 19:36:26 *** Supercheese has joined #openttdcoop.devzone 19:51:38 <Ammler> Alberth: devzone already supports backup-forward-push 19:52:17 <Alberth> both directions? 19:52:38 <Ammler> how do you push in "both directions"? 19:52:41 <Alberth> as that's what George wants/needs 19:52:50 <frosch123> Ammler: by creating multiple heads :p 19:53:03 <Alberth> one user commits at bitbucket, and another one at devzone 19:53:15 <Alberth> and it must be kept in sync 19:53:20 <frosch123> not that that would be useful though 19:53:32 <Ammler> not sure, if bitbucket also support push-forward, github does 19:54:08 <Ammler> also adding pull like we push wouldn't be a big deal to 19:54:11 <Ammler> too* 19:54:20 <Alberth> with multiple heads? 19:54:32 <Ammler> how should multiple heads matter? 19:54:50 <Alberth> George has it working now, perhaps leave it like that for now 19:55:08 <Alberth> hg refuses to create multiple heads remotely, unless you override 19:55:18 <Ammler> I just read your line and answered i, no clue what the George issue is :-) 19:55:38 <Ammler> just add - or --new-heads 19:55:43 <Ammler> -f* 19:56:03 <Ammler> or --new-branches, dunno anymore 19:56:17 <Ammler> but the script does -f afaik 19:56:19 <Alberth> yeah, but I am far from sure that George likes to deal with multiple heads 19:56:43 <Ammler> automatic script needs -f 19:57:19 <Alberth> I suggest to leave it for now, George has a solution that works for him now, as far as I know 19:57:44 <Ammler> well, is push to devzone still a issue? 19:58:33 <Alberth> not for me, but perhaps for someone else? 20:56:14 *** ODM has quit IRC 21:09:13 <Brot6> Webtranslator - Revision 12:7ab782174d1f: Feature: Improved project overview web page. XAlberthX @ http://dev.openttdcoop.org/projects/eints/repository/revisions/7ab782174d1f 21:42:32 *** Alberth has left #openttdcoop.devzone 22:12:51 *** frosch123 has quit IRC 22:24:35 *** LordAro has quit IRC 23:37:19 *** andythenorth has quit IRC