search for: branchmerg

My rails project is at version 52. I want to revert the whole app to version 50, effectively ignoring v 51+52 I ran "svn update -r 50" in my working copy. Success. I have done some work on version 50, but when i try commiting it tells me that the file im commiting is out of date. DOes anyone know the solution? Thanks Chris -- Posted via http://www.ruby-forum.com/.

On Fri, 2006-08-11 at 17:20 -0400, Daniel F. Savarese wrote: > Kevin Smith writes > : > >Can someone who has used SVN comment? > > I started reading it and stopped before finishing because the author > is judging Subversion by using it in a way that doesn''t make any sense > for Subversion. Fair enough. Can you confirm that merging between branches within an

Has anyone got any neat solutions for Asterisk .conf file revision control? We have multiple Asterisk boxes here, that we'd like to maintain a _mostly_ common set of conf files on. They aren't all the same though. There's subtle differences. For example, in sip.conf, iax.conf etc, the bindaddr setting is different. Dundi.conf is very different between each system. At the moment I