{"thread":{"id":"16786","subject":"[topgit] shared topic branch","startedAt":"2008-12-18T20:02:33Z","lastAt":"2009-01-30T10:15:30Z","messageCount":4,"participants":["Fabien Thomas","martin f krafft"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"98280","messageId":"EFB70468-7900-4B22-925D-3FC5F05F951B@gmail.com","threadId":"16786","inReplyTo":null,"subject":"[topgit] shared topic branch","fromName":"Fabien Thomas","fromEmail":"thomas.fabien@gmail.com","sentAt":"2008-12-18T20:02:33Z","receivedAt":"2008-12-18T20:02:33Z","isPatch":false,"sender":{"key":"thomas.fabien@gmail.com","avatar":null},"body":"Hi,\n\nI'm testing topgit 0.5 in a shared env. (multiple user working on same  \npatch).\n\nAfter following the tutorial i end up with something like this:\n\n$ git branch\n   master\n   topic/test1\n* topic/test2\n$ git branch -r\n   origin/HEAD\n   origin/master\n   origin/svn_stable_7\n   origin/svn_trunk\n   origin/top-bases/topic/test1\n   origin/top-bases/topic/test2\n   origin/topic/test1\n   origin/topic/test2\n\nMy problem is that when i want to push my local work i'm doing \"git  \npush\" that will force update the remote branch.\nThe problem is that each time master is not up to date i will push my  \nentire master or topic branch to the remote.\n\nAfter looking at git config file it seems that this is something  \nnormal generated by \"tg remote --populate origin\":\n\n[core]\n\trepositoryformatversion = 0\n\tfilemode = true\n\tbare = false\n\tlogallrefupdates = true\n[remote \"origin\"]\n\turl = ssh://git@xxx.com\n\tfetch = +refs/heads/*:refs/remotes/origin/*\n\tfetch = +refs/top-bases/*:refs/remotes/origin/top-bases/*\n\tpush = +refs/top-bases/*:refs/top-bases/*\n\tpush = +refs/heads/*:refs/heads/*\n[branch \"master\"]\n\tremote = origin\n\tmerge = refs/heads/master\n[merge \"ours\"]\n\tname = \\\"always keep ours\\\" merge driver\n\tdriver = touch %A\n[topgit]\n\tremote = origin\n\nWhat i'm doing wrong ?\n\nRegards,\nFabien\n"},{"id":"102086","messageId":"20090126120049.GA9676@lapse.rw.madduck.net","threadId":"16786","inReplyTo":"EFB70468-7900-4B22-925D-3FC5F05F951B@gmail.com","subject":"Re: [topgit] shared topic branch","fromName":"martin f krafft","fromEmail":"madduck@madduck.net","sentAt":"2009-01-26T12:00:49Z","receivedAt":"2009-01-26T12:00:49Z","isPatch":false,"sender":{"key":"madduck@madduck.net","avatar":null},"body":"also sprach Fabien Thomas <thomas.fabien@gmail.com> [2008.12.18.2102 +0100]:\n> I'm testing topgit 0.5 in a shared env. (multiple user working on same  \n> patch).\n\nSorry for the late reply!\n\n> My problem is that when i want to push my local work i'm doing\n> \"git  push\" that will force update the remote branch. The problem\n> is that each time master is not up to date i will push my  entire\n> master or topic branch to the remote.\n\nI do not understand what you mean. Could yo please try to give us\nmore detail? git push is intended to push all local changes to the\nremote, so I don't understand what your problem is.\n\n> [remote \"origin\"]\n[...]\n> \tpush = +refs/top-bases/*:refs/top-bases/*\n> \tpush = +refs/heads/*:refs/heads/*\n\nThose two lines ensure that git pushes all local heads as well as\nall top-bases.\n\n-- \nmartin | http://madduck.net/ | http://two.sentenc.es/\n \nit may look like i'm just sitting here doing nothing.\nbut i'm really actively waiting\nfor all my problems to go away.\n \nspamtraps: madduck.bogus@madduck.net\n"},{"id":"102094","messageId":"111E5FDD-FC51-4DD2-9959-676003CD7A61@gmail.com","threadId":"16786","inReplyTo":"20090126120049.GA9676@lapse.rw.madduck.net","subject":"Re: [topgit] shared topic branch","fromName":"Fabien Thomas","fromEmail":"thomas.fabien@gmail.com","sentAt":"2009-01-27T07:23:19Z","receivedAt":"2009-01-27T07:23:19Z","isPatch":false,"sender":{"key":"thomas.fabien@gmail.com","avatar":null},"body":">> I'm testing topgit 0.5 in a shared env. (multiple user working on  \n>> same\n>> patch).\n>\n> Sorry for the late reply!\nThanks to reply :)\n>\n>\n>> My problem is that when i want to push my local work i'm doing\n>> \"git  push\" that will force update the remote branch. The problem\n>> is that each time master is not up to date i will push my  entire\n>> master or topic branch to the remote.\n>\n> I do not understand what you mean. Could yo please try to give us\n> more detail? git push is intended to push all local changes to the\n> remote, so I don't understand what your problem is.\n\nI'm new to topgit and to git so maybe there is something i've  \nmisunderstood:\n\non the git side:\nthe + will overwrite all remote location branche named with that  \npattern ?\n\non topgit:\ni'm just doing patches on two computer (home+work) and i'm pushing on  \na central repo to \"backup/share my changes\"\nif i'm not up to date and i start a push with the \"+\" will overwrite  \nthe central repo with my local branch. (overwrite of my central repo  \nmaster branch and my topics)\n\nto \"solve\"  my problem i've replaced  the remote section with this:\n[remote \"origin\"]\n     url = ssh://git@xxx.com\n     fetch = refs/heads/*:refs/remotes/origin/*\n     fetch = refs/top-bases/*:refs/remotes/origin/top-bases/*\n     push = refs/top-bases/*:refs/top-bases/*\n     push = refs/heads/topic/*:refs/heads/topic/*\n\nis it more clear?\n\n\n"},{"id":"102560","messageId":"20090130101530.GA20372@lapse.rw.madduck.net","threadId":"16786","inReplyTo":"111E5FDD-FC51-4DD2-9959-676003CD7A61@gmail.com","subject":"Re: [topgit] shared topic branch","fromName":"martin f krafft","fromEmail":"madduck@madduck.net","sentAt":"2009-01-30T10:15:30Z","receivedAt":"2009-01-30T10:15:30Z","isPatch":false,"sender":{"key":"madduck@madduck.net","avatar":null},"body":"also sprach Fabien Thomas <thomas.fabien@gmail.com> [2009.01.27.0823 +0100]:\n> on the git side:\n> the + will overwrite all remote location branche named with that pattern \n> ?\n\n+ simply allows non-fast-forwards. See git-push(1). And that's on\nthe local side, not the remote. Which is what you want.\n\n> if i'm not up to date and i start a push with the \"+\" will\n> overwrite the central repo with my local branch. (overwrite of my\n> central repo master branch and my topics)\n\nplease reproduce the problem and paste the complete transcript of\nwhat you are doing: commands and output, as well as the output of\ngit branch -av before and after.\n\n-- \nmartin | http://madduck.net/ | http://two.sentenc.es/\n \n\"now, bring me that horizon.\"\n                                               -- captain jack sparrow\n \nspamtraps: madduck.bogus@madduck.net\n"}]}