Re: Merge, reintegrate, and merge with tree conflicts

2013-02-22 Thread Matthew Pounsett
On 2013/02/22, at 14:15, James Hanley wrote: > We are seeing merge tree conflicts where I believe svn is not working > as expected. I'm not entirely sure if this is due to a lack of > understanding for proper use on our part, but it was my understanding > that reintegrate was to be used when pul

Re: Unexpected conflicts merging updates from trunk to a branch

2013-02-08 Thread Matthew Pounsett
On 2013/02/07, at 10:09, Stefan Sperling wrote: > On Thu, Feb 07, 2013 at 09:19:47AM -0500, Matthew Pounsett wrote: >> >> I've been running into unexpected tree conflicts when updating branches from >> the trunk, after reintegrating to the trunk where and file adds or

Unexpected conflicts merging updates from trunk to a branch

2013-02-07 Thread Matthew Pounsett
I've been running into unexpected tree conflicts when updating branches from the trunk, after reintegrating to the trunk where and file adds or removes were involved in the reintegrate. I expect I'm doing something wrong here, but I haven't been able to figure out what. Can someone point me i

Re: Square brackets in file names and authz (in VisualSVN 2.5.5)

2012-07-11 Thread Matthew Pounsett
On 2012/07/11, at 20:20, David Brodbeck wrote: > On Wed, Jul 11, 2012 at 8:01 AM, Matthew Pounsett wrote: >> I note by your examples that you're using a unix filesystem (as opposed to >> Windows). I would be a little surprised if this worked there, since the >> sq

Re: Cleaning out an old subscriber

2012-07-11 Thread Matthew Pounsett
On 2012/07/11, at 12:13, Bob Archer wrote: > If you send me the full email that is causing the bounce I can unsubscribe > it. I haven't seen the bounces. Sorry, a regular subscriber can't help you there. I have no idea what subscribed email address leads to that destination, and can't know wi

Cleaning out an old subscriber

2012-07-11 Thread Matthew Pounsett
your inquiry. Justin Vallon is no longer with the firm. For > immediate assistance, please contact Reception at +1-212-478-. > > Sincerely, > The D. E. Shaw Group > > > -- 8< --- CUT HERE ------ CUT HERE --- >8 -- > > From:Matthew P

Re: Square brackets in file names and authz (in VisualSVN 2.5.5)

2012-07-11 Thread Matthew Pounsett
On 2012/07/11, at 01:13, Jason Heeris wrote: > The problem is this: it doesn't seem to work on files with the '[' or ']' > characters in their name. Ignoring VisualSVN's GUI for now, I've tried going > one step further and editing the "authz-windows" file by hand and I just > can't seem to get

Re: Difficulty with post-commit emails

2012-07-10 Thread Matthew Pounsett
On 2012/07/09, at 16:03, Daniel Shahaf wrote: > Please confirm that $PWD was '/var/svn/repos' when you ran this command. I did eventually figure this out yesterday. Thanks for the response though! I was passing the name of the repository, rather than the path to the repository. I guess I assu

Difficulty with post-commit emails

2012-07-09 Thread Matthew Pounsett
Apologies if this is handled on the list recently, but I haven't had any luck googling an answer.. don't see anything in the manual either. Although I've done lots of upgrades, it's been a while since I installed a new subversion server completely from scratch, so I'm just now running into the