Re: [brlcad-devel] svn merge problem

2013-09-20 Thread Tom Browder
On Sat, Aug 31, 2013 at 12:08 PM, Christopher Sean Morrison wrote: > > On Aug 31, 2013, at 1:05 PM, Christopher Sean Morrison wrote: > >> The server is 1.7.7, which is pretty darn recent, but not as recent as your >> 1.8 dev version. The repo should handle the "new" method since 1.5. The fact t

Re: [brlcad-devel] svn merge problem

2013-08-31 Thread Tom Browder
On Sat, Aug 31, 2013 at 12:08 PM, Christopher Sean Morrison wrote: > The backend is a 1.7 repository, so something else is going on or you're > using some feature that requires a 1.8 dev backend. Does the merge example > in the HACKING release steps work? It merely requires knowing what the > la

Re: [brlcad-devel] svn merge problem

2013-08-31 Thread Christopher Sean Morrison
On Aug 31, 2013, at 1:05 PM, Christopher Sean Morrison wrote: > The server is 1.7.7, which is pretty darn recent, but not as recent as your > 1.8 dev version. Mergeinfo attributes have been in place since 1.5+ iirc, so > I'm guessing it's just something specific with the way that request is bei

Re: [brlcad-devel] svn merge problem

2013-08-31 Thread Christopher Sean Morrison
On Aug 31, 2013, at 12:29 PM, Tom Browder wrote: > I created a private branch to fiddle with objects and time stamps and I'm > trying to merge trunk changes to it. According to the svn docs I should be > able to do this in my branch working dir: > > $ svn merge ^/brlcad/trunk . > > but I g