Thread: [brlcad-devel] rev 50643 was a runaway commit--need to "uncommit" it
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: Tom B. <tom...@gm...> - 2012-05-23 20:24:22
|
Sorry, I intended to commit only the one file for rev 50643: regress/vls.sh The rest got away and shouldn't have been committed. Help! I know the svn merge command can be used but I'm not sure how to fix the mess. -Tom |
From: Clifford Y. <cli...@gm...> - 2012-05-23 20:34:05
|
On Wed, May 23, 2012 at 4:23 PM, Tom Browder <tom...@gm...> wrote: > Sorry, I intended to commit only the one file for rev 50643: > > regress/vls.sh > > The rest got away and shouldn't have been committed. > > Help! I know the svn merge command can be used but I'm not sure how > to fix the mess. svn merge -r50643:50642 or some variation thereof is probably what you're looking for. Cliff |
From: Tom B. <tom...@gm...> - 2012-05-23 20:52:04
|
On Wed, May 23, 2012 at 3:33 PM, Clifford Yapp <cli...@gm...> wrote: > On Wed, May 23, 2012 at 4:23 PM, Tom Browder <tom...@gm...> wrote: >> Sorry, I intended to commit only the one file for rev 50643: >> >> regress/vls.sh >> >> The rest got away and shouldn't have been committed. >> >> Help! I know the svn merge command can be used but I'm not sure how >> to fix the mess. > > svn merge -r50643:50642 > > or some variation thereof is probably what you're looking for. Okay, thanks. This seemed to do the trick: svn merge -r50643:50642 https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk svn commit -m"undoing bad commit rev 50643" Best, -Tom > > Cliff > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > BRL-CAD Developer mailing list > brl...@li... > https://lists.sourceforge.net/lists/listinfo/brlcad-devel |
From: Tom B. <tom...@gm...> - 2012-05-23 22:37:14
|
On Wed, May 23, 2012 at 3:51 PM, Tom Browder <tom...@gm...> wrote: > On Wed, May 23, 2012 at 3:33 PM, Clifford Yapp <cli...@gm...> wrote: >> On Wed, May 23, 2012 at 4:23 PM, Tom Browder <tom...@gm...> wrote: Again, sorry for the bad commit, but, as penance, I have made a stab at describing the fix on the BRL-CAD wiki on page: http://brlcad.org/wiki/Undoing-a-commit You can find a link to it on the front page: http://brlcad.org/wiki/Main_Page => Getting Started => SVN => Undoing a commit Comments and edits welcome. Best, -Tom |
From: brlcad <br...@ma...> - 2012-05-24 00:23:49
|
On May 23, 2012, at 04:51 PM, Tom Browder <tom...@gm...> wrote: Okay, thanks. This seemed to do the trick: svn merge -r50643:50642 https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk svn commit -m"undoing bad commit rev 50643" If you don't have any local changes, I believe you can substitute the repo root with an "svn merge -r50643:50642 ." and maybe even if you do. Minor terminology navel-gazing food-for-thought point if you go searching the web, that's referred to as reverting a commit. Technically you cannot 'undo' commits with Subversion and some other revision control systems (not the whole story, but close enough for this explanation). You can only apply a "reverse" set of changes for a given sequence of commits as your next revision. No worries on the revert. They happen and shouldn't be hesitated when a commit breaks something or was unintentional, even if it's someone else's commit. They are supposed to be common and aren't to be taken personally either. It's just a way to say "wait a sec, there's a problem." It's then supposed to be the original committers responsibility to address the issue being raised or help fix the breakage that provoked someone to revert. It's the open source way. For most meritocratic projects at least. Cheers! Sean |
From: Tom B. <tom...@gm...> - 2012-05-24 00:29:12
|
On Wed, May 23, 2012 at 7:23 PM, brlcad <br...@ma...> wrote: ... > If you don't have any local changes, I believe you can substitute the repo > root with an "svn merge -r50643:50642 ." and maybe even if you do. Nope, didn't work in this case. ... Best, -Tom |
From: brlcad <br...@ma...> - 2012-05-24 01:47:36
|
On May 23, 2012, at 08:28 PM, Tom Browder <tom...@gm...> wrote: On Wed, May 23, 2012 at 7:23 PM, brlcad <br...@ma...> wrote: > If you don't have any local changes, I believe you can substitute the repo > root with an "svn merge -r50643:50642 ." and maybe even if you do. Nope, didn't work in this case. Yeah, it should have worked, so something else is/was going on... http://stackoverflow.com/questions/1930725/svn-reverse-merge http://blog.mafr.de/2008/05/13/revert-a-commit-in-svn/ http://stackoverflow.com/questions/2324999/revert-a-svn-folder-to-a-previous-revision etc. Cheers! Sean |
From: Tom B. <tom...@gm...> - 2012-05-24 02:15:18
|
On Wed, May 23, 2012 at 8:46 PM, brlcad <br...@ma...> wrote: > On May 23, 2012, at 08:28 PM, Tom Browder <tom...@gm...> wrote: > On Wed, May 23, 2012 at 7:23 PM, brlcad <br...@ma...> wrote: >> If you don't have any local changes, I believe you can substitute the repo >> root with an "svn merge -r50643:50642 ." and maybe even if you do. > Nope, didn't work in this case. > Yeah, it should have worked, so something else is/was going on... Aha, those used the '.' (here) as the URL. I missed that. Best, -Tom |