vendor branch merge: how to highlight patches for review?

2012-08-28 Thread Q. Chap
Hello, I've been reading: http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.advanced.vendorbr http://svnbook.red-bean.com/en/1.7/svn-book.html#svn.advanced.vendorbr&lang= This looks great, but I have a question. (Assuming, per the examples, that I have local patches to "libcomplex-1.0")

Re: vendor branch merge: how to highlight patches for review?

2012-08-28 Thread Q. Chap
> > > > What command(s) should I use to bring in the "libcomplex/2.0" changes but > > identify the all files I ever messed with? > > These are two separate operations. > >  [snip] > > $ svn merge ^/vendor/libcomplex/1.0 \ >  ^/vendor/libcomplex/2.0 \ >  libcomplex > > [snip] > > And then subsequ

Re: vendor branch merge: how to highlight patches for review?

2012-08-29 Thread Q. Chap
> >> Ideally, after the merge (but before commit) I'd like to be able to run a > >> command like: > >> "svn diff --show-patches-to-vendor-code" > >> > >> Output: list of lib files that I've changed at any point since the > >> previous vendor drop. > >> > >> Could I do something like diff the (p

Re: vendor branch merge: how to highlight patches for review?

2012-08-29 Thread Q. Chap
> > > > Couple of questions: > > > > 1. "--summarize" complains that it can only work on URL-URL diffs.  Is > > there a work around? > > No. > > Well, maybe you could do something like >  svn diff | grep ^Index > to obtain a list of filenames from the full diff output? > Interesting idea. Out cur

Re: vendor branch merge: how to highlight patches for review?

2012-08-30 Thread Q. Chap
> > > > 3. Running the above diff also outputs lines related to some files that > > > > I know I never modifed, but did recive updates via the merge. Oddly, > > > > these are all binary files. > > > > > > > >    Index: Path/to/bin.dat > > > >    ==

Re: vendor branch merge: how to highlight patches for review?

2012-08-30 Thread Q. Chap
> > you can see which files you changed using this command: > > > > $ svn diff --summarize \ > > http://svn.example.com/repos/vendor/libcomplex/1.0 \ > > http://svn.example.com/repos/calc/libcomplex > > > It answers the question you asked, which was: &

Re: vendor branch merge: how to highlight patches for review? [CORRECTED]

2012-08-30 Thread Q. Chap
CORRECTION: Changed /trunk to ^/branches/boring_new_stuff.  Item #2 "is it a bug" hopefully makes sense now. > > > > 3. Running the above diff also outputs lines related to some files that > > > > I know I never modifed, but did recive updates via the merge. Oddly, > > > > these are all binary

Re: vendor branch merge: how to highlight patches for review?

2012-08-30 Thread Q. Chap
> On Thu, Aug 30, 2012 at 12:36:54PM -0400, Q. Chap wrote: > > 1. I forked a branch from /branches/boring_new_stuff to > > /branches/awsome_stuff. > > 2. /branches/boring_new_stuff development has continued full speed. (300+ > > files changed over many commits) &g

How to tell if I am using HTTPv2?

2012-09-24 Thread Q. Chap
Hello, I've recently upgraded my svn client to 1.7.  I'm not sure which version the server is. It's not reported in the http headers. I guess it does not matter what the exact server version is, but how can I verify if my client and the server are communicating via HTTPv2 or the older http ba