{"thread":{"id":"13713","subject":"Repository usage","startedAt":"2008-05-28T21:51:20Z","lastAt":"2008-05-28T21:51:20Z","messageCount":1,"participants":["Nikola Knežević"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"77981","messageId":"21512C1E-EEA3-43C1-9099-78563B64DC44@gmx.ch","threadId":"13713","inReplyTo":null,"subject":"Repository usage","fromName":"Nikola Knežević","fromEmail":"nikkne@gmx.ch","sentAt":"2008-05-28T21:51:20Z","receivedAt":"2008-05-28T21:51:20Z","isPatch":false,"sender":{"key":"nikkne@gmx.ch","avatar":null},"body":"Hi all,\nI have a question related on how to use VCS's, and git in particular.\n\nSo, the situation is this:\nwe were using project called Mace (framework for building dist.  \nsystems). Up until 1yr ago, it was a monolithic project, contained in  \none SVN repository. We build a lot of changes on top of original code,  \nbut we never synchronized with the main repository. Then, the  \ndevelopers decided to split the repository into 2 parts - public and  \nprivate. They also switched to CMake, so it was possible to use cmake  \nto build both public and private part in one invocation (although they  \nwere in separate directories). IHMO, their idea was quite stupid!  \nSince we now need to synchronize with their code, I don't know what to  \ndo... Our code relies on parts of public and private, and build order  \nis also important, so I can't update only one part.\n\nBefore I describe what I need, if I use /\\ for set intersection, and  \n\\/ for union, situation is like this:\npublic/\\private = mostly makefiles, public\\/private == old mace\n\nSince I need both parts, their complete union, and I need to update to  \nlatest code (a lot of performance&bug fixes is there), I thought to  \nuse git-svn to create one branch for public, one for private, and then  \nmerge both to the same branch. Both public and private contain the  \nsame layout, but there are different files in directories. Is this  \neven possible? Is there any better solution?\n\nThanks, and sorry if I've missed the right mailing list...\nNikola\n"}]}