{"thread":{"id":"20033","subject":"\"git svn reset\" only resets current branch ?","startedAt":"2009-07-06T10:07:37Z","lastAt":"2009-07-06T22:14:29Z","messageCount":4,"participants":["Yann Dirson","Eric Wong","Ben Jackson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"117498","messageId":"43948.10.0.0.1.1246874857.squirrel@intranet.linagora.com","threadId":"20033","inReplyTo":null,"subject":"\"git svn reset\" only resets current branch ?","fromName":"Yann Dirson","fromEmail":"ydirson@linagora.com","sentAt":"2009-07-06T10:07:37Z","receivedAt":"2009-07-06T10:07:37Z","isPatch":false,"sender":{"key":"ydirson@linagora.com","avatar":null},"body":"I just tried the new \"git svn reset\" from master, and got puzzled that\nonly the svn branch which is an ancestor of current git HEAD got rolled\nback. Is that the expected behaviour ? It would not make it very easy to\nfixup imports from svn trees with lots of branches/tags.\n"},{"id":"117513","messageId":"20090706212928.GA11043@dcvr.yhbt.net","threadId":"20033","inReplyTo":"43948.10.0.0.1.1246874857.squirrel@intranet.linagora.com","subject":"Re: \"git svn reset\" only resets current branch ?","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2009-07-06T21:29:28Z","receivedAt":"2009-07-06T21:29:28Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Yann Dirson wrote:\n> I just tried the new \"git svn reset\" from master, and got puzzled that\n> only the svn branch which is an ancestor of current git HEAD got rolled\n> back. Is that the expected behaviour ? It would not make it very easy to\n> fixup imports from svn trees with lots of branches/tags.\n\nBen was the original implementer of this idea, so I'm not sure of his\nreasoning behind it. For one, it's easier to only roll back one svn\nbranch. Perhaps adding an --all flag to this command would be the best\nway to go?\n\n-- \nEric Wong\n"},{"id":"117519","messageId":"20090706215619.GA38984@kronos.home.ben.com","threadId":"20033","inReplyTo":"20090706212928.GA11043@dcvr.yhbt.net","subject":"Re: \"git svn reset\" only resets current branch ?","fromName":"Ben Jackson","fromEmail":"ben@ben.com","sentAt":"2009-07-06T21:56:20Z","receivedAt":"2009-07-06T21:56:20Z","isPatch":false,"sender":{"key":"ben@ben.com","avatar":"https://gravatar.com/avatar/df49904dd23b03a5f57d9d53c0bf9fb6f69a14fac075c98f54f26cf1ce960794?d=mp&s=160"},"body":"On Mon, Jul 06, 2009 at 02:29:28PM -0700, Eric Wong wrote:\n> Yann Dirson wrote:\n> > I just tried the new \"git svn reset\" from master, and got puzzled that\n> > only the svn branch which is an ancestor of current git HEAD got rolled\n> > back. Is that the expected behaviour ? It would not make it very easy to\n> > fixup imports from svn trees with lots of branches/tags.\n> \n> Ben was the original implementer of this idea, so I'm not sure of his\n> reasoning behind it. For one, it's easier to only roll back one svn\n> branch. Perhaps adding an --all flag to this command would be the best\n> way to go?\n\nThe only SVN repos I use git-svn with are either too huge and complex to\nfully import with git (up to r135000 at work) or too small to have any\nbranches (all the various open source projects I've git-svn cloned). So\nthe main reason it works that way is that I've never really used git-svn\nwith branches.\n\nEric,\n\nDo you expect that it would work to reset one branch and re-fetch it\nwithout touching the other branches? If not, it would probably imply:\n\nShould cmd_reset always loop over all remotes like cmd_multi_fetch?\n\nAs the \"opposite of fetch\" should it take '--all' and conditionally\nloop?\n\nYann,\n\nIt would help if you made a test case (or extended t9139-git-svn-reset.sh)\nthat illustrated the problem and the desired behavior.\n\n-- \nBen Jackson AD7GD\n\nhttp://www.ben.com/\n"},{"id":"117521","messageId":"20090706221428.GB8219@dcvr.yhbt.net","threadId":"20033","inReplyTo":"20090706215619.GA38984@kronos.home.ben.com","subject":"Re: \"git svn reset\" only resets current branch ?","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2009-07-06T22:14:29Z","receivedAt":"2009-07-06T22:14:29Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Ben Jackson wrote:\n> On Mon, Jul 06, 2009 at 02:29:28PM -0700, Eric Wong wrote:\n> > Yann Dirson wrote:\n> > > I just tried the new \"git svn reset\" from master, and got puzzled that\n> > > only the svn branch which is an ancestor of current git HEAD got rolled\n> > > back. Is that the expected behaviour ? It would not make it very easy to\n> > > fixup imports from svn trees with lots of branches/tags.\n> > \n> > Ben was the original implementer of this idea, so I'm not sure of his\n> > reasoning behind it. For one, it's easier to only roll back one svn\n> > branch. Perhaps adding an --all flag to this command would be the best\n> > way to go?\n> \n> The only SVN repos I use git-svn with are either too huge and complex to\n> fully import with git (up to r135000 at work) or too small to have any\n> branches (all the various open source projects I've git-svn cloned). So\n> the main reason it works that way is that I've never really used git-svn\n> with branches.\n> \n> Eric,\n> \n> Do you expect that it would work to reset one branch and re-fetch it\n> without touching the other branches? If not, it would probably imply:\n> \n> Should cmd_reset always loop over all remotes like cmd_multi_fetch?\n> \n> As the \"opposite of fetch\" should it take '--all' and conditionally\n> loop?\n\nI think the current behavior is a reasonable default; it's least\nsurprising to me and the user could more easily rerun with \"--all\" if\nneeded. If --all were the default, the user could potentially\nhave to refetch a lot of data they didn't want to.\n\n-- \nEric Wong\n"}]}