Merging a vendor branch that's also in subversion

2012-03-02 Thread Steve Lustbader
My subversion-based project is based on a third-party project that is also stored in subversion, although on a separate server (to which we only have client access). We will soon need to merge the recent changes from the third-party project back into our own codebase. I am preparing to do a merge u

Re: Merging a vendor branch that's also in subversion

2012-03-02 Thread Stefan Sperling
On Fri, Mar 02, 2012 at 02:01:58PM -0500, Steve Lustbader wrote: > My subversion-based project is based on a third-party project that is also > stored in subversion, although on a separate server (to which we only have > client access). We will soon need to merge the recent changes from the > third

Re: Merging a vendor branch that's also in subversion

2012-03-02 Thread Steve Lustbader
On Fri, Mar 2, 2012 at 2:25 PM, Stefan Sperling wrote: > On Fri, Mar 02, 2012 at 02:01:58PM -0500, Steve Lustbader wrote: > > My subversion-based project is based on a third-party project that is > also > > stored in subversion, although on a separate server (to which we only > have > > client ac