{"thread":{"id":"17300","subject":"lineups with GIT","startedAt":"2009-01-22T07:54:42Z","lastAt":"2009-01-23T18:01:31Z","messageCount":3,"participants":["outre","Jakub Narebski","Daniel Barkalow"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"101511","messageId":"1232610882661-2196604.post@n2.nabble.com","threadId":"17300","inReplyTo":null,"subject":"lineups with GIT","fromName":"outre","fromEmail":"spoony.sob@hotmail.com","sentAt":"2009-01-22T07:54:42Z","receivedAt":"2009-01-22T07:54:42Z","isPatch":false,"sender":{"key":"spoony.sob@hotmail.com","avatar":null},"body":"\nI am trying to set up two different line-ups for a project (development and\ntesting).\n\nThe development line-up is the master, and test line-up pulls data from it.\nThe code is the same in both.\nBut since the line-ups are served from two different domains one folder in\nthe development line-up is called\niWeb.local, and in the test line-up it is called iWeb.test. That is the only\ndifference between the two.\n\nI tried using \"git mv\" command and it somewhat solved the problem. After I\ncloned the devel line-up, I used \"git rm iWeb.local iWeb.test\".\nAnd now if I edit a file in iWeb.local and do a pull to iWeb.test this file\ngets properly updated while preserving the difference between\nthe folder names. But if I add a new file to iWeb.local, and then do a pull\nI get  iWeb.local folder added together with the \nnew file to the testing line-up.\n\nI was wondering if it is intended behaviour for GIT. And if it is may be\nsomeone can point me to a better way to setup two line-ups using\nGIT.\n\nThanks\n-- \nView this message in context: http://n2.nabble.com/lineups-with-GIT-tp2196604p2196604.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"101668","messageId":"m3mydix7bq.fsf@localhost.localdomain","threadId":"17300","inReplyTo":"1232610882661-2196604.post@n2.nabble.com","subject":"Re: lineups with GIT (or dealing with directory renames)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2009-01-23T17:25:30Z","receivedAt":"2009-01-23T17:25:30Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"outre <spoony.sob@hotmail.com> writes:\n\n[...]\n> I tried using \"git mv\" command and it somewhat solved the problem. After I\n> cloned the devel line-up, I used \"git rm iWeb.local iWeb.test\".\n> And now if I edit a file in iWeb.local and do a pull to iWeb.test this file\n> gets properly updated while preserving the difference between\n> the folder names. But if I add a new file to iWeb.local, and then do a pull\n> I get  iWeb.local folder added together with the \n> new file to the testing line-up.\n> \n> I was wondering if it is intended behaviour for GIT. And if it is may be\n> someone can point me to a better way to setup two line-ups using\n> GIT.\n\nI know nothing about line-ups, but the behaviour wrt. wholesame\ndirectory renames is _known_ behavior of git. If one side renames\ndirectory, and other side creates new files in old-name directory,\nthe old-name directory gets recreated during merging.\n\nI wrote _known_ and not _intendend_ because this can be changed;\nthere were some patches on git mailing list (I don't know what\nhappened to them; I think the development stalled) that added\ndetecting wholesame rename of directories, based on heuristic\ncontent and filename similarity based detection of renames for\nindividual files.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"101672","messageId":"alpine.LNX.1.00.0901231247100.19665@iabervon.org","threadId":"17300","inReplyTo":"1232610882661-2196604.post@n2.nabble.com","subject":"Re: lineups with GIT","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2009-01-23T18:01:31Z","receivedAt":"2009-01-23T18:01:31Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Wed, 21 Jan 2009, outre wrote:\n\n> I am trying to set up two different line-ups for a project (development and\n> testing).\n> \n> The development line-up is the master, and test line-up pulls data from it.\n> The code is the same in both.\n> But since the line-ups are served from two different domains one folder in\n> the development line-up is called\n> iWeb.local, and in the test line-up it is called iWeb.test. That is the only\n> difference between the two.\n>\n> I tried using \"git mv\" command and it somewhat solved the problem. After I\n> cloned the devel line-up, I used \"git rm iWeb.local iWeb.test\".\n> And now if I edit a file in iWeb.local and do a pull to iWeb.test this file\n> gets properly updated while preserving the difference between\n> the folder names. But if I add a new file to iWeb.local, and then do a pull\n> I get  iWeb.local folder added together with the \n> new file to the testing line-up.\n> \n> I was wondering if it is intended behaviour for GIT. And if it is may be\n> someone can point me to a better way to setup two line-ups using\n> GIT.\n\nThe best thing is probably to have both of them store everything in a \ndirectory \"iWeb\", and have whatever process is used to make something \nstart serving things copy the directory into whatever location it needs. \nIt helps a lot with git if any two versions that are effectively the same \nare exactly the same.\n\nOne handy trick is to have a script that reads an untracked file to \ndetermine where and how to arrange stuff for installation. Then you can \nhave different values in the working directories for the two repositories, \nand the same (tracked) script in each repository will do the appropriate \ndifferent thing for that repository, while leaving the tracked content for \ndevelopment exactly the same in testing.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"}]}