Re: Managing Vendor Branches

2010-03-01 Thread sNop
Dne 1. 3. 2010 15:09, Olivier Sannier napsal(a): > There is the svn_load_dirs.pl script but it's not very intuitive to use. > For those who are under Windows, I wrote a wizard based tool that > manages those externals for you. > Its sources (Delphi 2009) are available here: > > http://svnwintools.t

Re: Managing Vendor Branches

2010-03-01 Thread C. Michael Pilato
Stefan Sperling wrote: > On Sun, Feb 28, 2010 at 10:41:52AM -0800, Jeff Mott wrote: >> On Sun, Feb 28, 2010 at 4:28 AM, Stefan Sperling wrote: >>> On Sat, Feb 27, 2010 at 09:09:14PM -0800, Jeff Mott wrote: I just discovered that using --ignore-ancestry fixed the problem. This caused SVN

Re: Managing Vendor Branches

2010-03-01 Thread Olivier Sannier
James Mansion wrote: Jeff Mott wrote: I've recently needed to track changes for vendor code drops, so I read the SVN book's vendor branches chapter. But I'm not entirely happy with part of the procedure, so I'd like to talk it out and, I hope, find a better way. I struggled with findinng a way t

Re: Managing Vendor Branches

2010-03-01 Thread Greg Troxel
I see you figured this out, but what I do is initial import: import v1 to vendor/v1 copy vendor/v1 to vendor/trunk copy vendor/trunk to trunk nth import: import vN to vendor/vN merge --ignore-ancestry vendor/v(N-1) vendor/vN to vendor/trunk # note that now we have a vendor branch with st

Re: Managing Vendor Branches

2010-02-28 Thread James Mansion
Jeff Mott wrote: I've recently needed to track changes for vendor code drops, so I read the SVN book's vendor branches chapter. But I'm not entirely happy with part of the procedure, so I'd like to talk it out and, I hope, find a better way. I struggled with findinng a way to do this too. I ca

Re: Managing Vendor Branches

2010-02-28 Thread Stefan Sperling
On Sun, Feb 28, 2010 at 10:41:52AM -0800, Jeff Mott wrote: > On Sun, Feb 28, 2010 at 4:28 AM, Stefan Sperling wrote: > > On Sat, Feb 27, 2010 at 09:09:14PM -0800, Jeff Mott wrote: > >> I just discovered that using --ignore-ancestry fixed the problem. This > >> caused SVN to update rather than repl

Re: Managing Vendor Branches

2010-02-28 Thread Jeff Mott
On Sun, Feb 28, 2010 at 4:28 AM, Stefan Sperling wrote: > On Sat, Feb 27, 2010 at 09:09:14PM -0800, Jeff Mott wrote: >> I just discovered that using --ignore-ancestry fixed the problem. This >> caused SVN to update rather than replace my working copy. > > What is the ancestral relationship between

Re: Managing Vendor Branches

2010-02-28 Thread Stefan Sperling
On Sat, Feb 27, 2010 at 09:09:14PM -0800, Jeff Mott wrote: > I just discovered that using --ignore-ancestry fixed the problem. This > caused SVN to update rather than replace my working copy. What is the ancestral relationship between the branches containing the vendor drops? I assume they are jus

Re: Managing Vendor Branches

2010-02-27 Thread Jeff Mott
On Sat, Feb 27, 2010 at 6:32 PM, Jeff Mott wrote: > On Sat, Feb 27, 2010 at 4:00 AM, Stefan Sperling wrote: >> On Fri, Feb 26, 2010 at 09:49:56PM -0800, Jeff Mott wrote: >>> I've recently needed to track changes for vendor code drops, so I read >>> the SVN book's vendor branches chapter. But I'm

Re: Managing Vendor Branches

2010-02-27 Thread Jeff Mott
On Sat, Feb 27, 2010 at 4:00 AM, Stefan Sperling wrote: > On Fri, Feb 26, 2010 at 09:49:56PM -0800, Jeff Mott wrote: >> I've recently needed to track changes for vendor code drops, so I read >> the SVN book's vendor branches chapter. But I'm not entirely happy >> with part of the procedure, so I'd

Re: Managing Vendor Branches

2010-02-27 Thread BRM
- Original Message > From: Jeff Mott > I've recently needed to track changes for vendor code drops, so I read > the SVN book's vendor branches chapter. But I'm not entirely happy > with part of the procedure, so I'd like to talk it out and, I hope, > find a better way. > The part I hope

Re: Managing Vendor Branches

2010-02-27 Thread Ryan Schmidt
On Feb 26, 2010, at 23:49, Jeff Mott wrote: > I've recently needed to track changes for vendor code drops, so I read > the SVN book's vendor branches chapter. But I'm not entirely happy > with part of the procedure, so I'd like to talk it out and, I hope, > find a better way. > > The part I hope

Re: Managing Vendor Branches

2010-02-27 Thread Stefan Sperling
On Fri, Feb 26, 2010 at 09:49:56PM -0800, Jeff Mott wrote: > I've recently needed to track changes for vendor code drops, so I read > the SVN book's vendor branches chapter. But I'm not entirely happy > with part of the procedure, so I'd like to talk it out and, I hope, > find a better way. > > Th