OT SVN question:howto 'retrofit' a vendor branch?

Hi,

I'm sorry for the OT post, but I'm really stuck and the SVN
list seems 
pretty low traffic.  A casual glance through the archives
shows me a ton 
of unanswered questions...

Any SVN gurus here want to take a crack at helping a
numbskull out?



-------- Original Message --------
Subject: 	howto 'retrofit' a vendor branch?
Date: 	Mon, 27 Aug 2007 09:59:31 -0400
From: 	Aaron Bennett <abennettclarku.edu>
To: 	userssubversion.tigris.org



Hello,

I think this is a newbie question, but I can't figure out
how to 
accomplish this.  Here's my problem...

We've got a fairly hacked version of an open source package
that we rely 
on.  ( maia mailguard, as a point of interest ).  The
problem is, now 
that we've got it customized, the vendor has released at
least two 
smallish-but-significant dot releases.  We're running a
customized 1.0.0 
and current rev is 1.0.2.  When I first hacked it, I just
hacked each 
file as needed until it did what I wanted, as if I'd never
heard of 
'source control' or 'change management' before in my life.
(!)

Now, however, I want to bring my changed version of 1.0.0 up
to 1.0.2.  
I'm not _entirely_ sure of what files I hacked in 1.0.0 --
it's not a 
ton of them, but both the interface and the underlying stuff
was 
modified quite a bit to fit into our environment and to
satisfy the 
demands of our user support team.

Sounds like a job for... SUBVERSION, right?  RIGHT. 
Especially since 
the maia guys use svn to maintain the project.

So I got svn installed and working and read the 'Version
Control with 
Subversion' book on red-bean.com.  Awesome book and many
thanks to the 
authors, by the way.  It seems to me after reading that I
ought to treat 
the official dist of maia as a vendor branch in my main
project. 

here's what I've done...

1.  I created the suggested skeleton, maia/trunk ,
maia/branches, 
maia/tags, maia/vendor.
2.  from my source directory, svn import https://svn/maia/trunk
3.  grab maia 1.0.2 source, svn import https://svn/vendor/1.0.2

4.  check out trunk as working copy svn co https://svn/maia/trunk;
cd trunk

ok, now here's where I get messed up -- time to merge,
right?

4.  svn merge https://svn/maia/vendor
/1.0.2 https://svn/maia/trunk

what I get is:
[abennettwide trunk]$ svn merge https://svn/maia/vendor
/1.0.2 
https://svn/maia/trunk
Skipped missing target: 'LICENSE'
Skipped missing target: 'maia-mysql.sql'
Skipped missing target: 'amavisd-maia'
Skipped missing target: 'maia-pgsql.sql'
Skipped missing target: 'amavisd.conf.dist'
Skipped missing target: 'README'
Skipped missing target: 'maia.conf.dist'
Skipped missing target: 'reference'

( I don't understand that, I want to MERGE those missing
files into the 
trunk... why is it skipping them? )

then, instead of merging the vendor's changes on all of the
files, it 
deletes all of the old files and replaces them with new
ones.  why?

for example:

D    php/error.php
D    php/welcome.php
D    php/confirm.php
D    php/auth.php
D    php/adminhelp.php
D    php/xadminusers.php
D    php/mailtools.php
D    php/view.php
D    php
A    php
A    php/error.php
A    php/welcome.php
A    php/confirm.php
A    php/auth.php
A    php/adminhelp.php
A    php/xadminusers.php
A    php/mailtools.php
A    php/view.php


I'm obviously missing something.  I thought, maybe I'm going
the wrong 
way, and I want instead svn merge https://svn/maia/trunk 
https://svn/maia/vendor
/1.0.2 . but that doesn't work either... it 
correctly adds the new files, but still deletes all of the
old stuff and 
re-adds it instead of merging.

help!  It's clear that I'm confused, that's all that's clear
though.

Thanks for your time,

Aaron Bennett
Unix Administrator
Clark University ITS

------------------------------------------------------------
---------
To unsubscribe, e-mail: users-unsubscribesubversion.tigris.org
For additional commands, e-mail: users-helpsubversion.tigris.org


_______________________________________________
Maia-users mailing list
Maia-usersrenaissoft.com
http://www.renaissoft.com/mailman/listinfo/maia-users

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


On Aug 27, 2007, at 10:44 AM, Aaron Bennett wrote:

> Hi,
>
> I'm sorry for the OT post, but I'm really stuck and the
SVN list seems
> pretty low traffic.  A casual glance through the
archives shows me  
> a ton
> of unanswered questions...
>
> Any SVN gurus here want to take a crack at helping a
numbskull out?


 From what I read below, svn isn't what you need, at least,
not like  
that.   What you need is to find the "diff"
between your  
modifications and the original source, and then apply that
to the new  
sources.  You will run into conflicts, I'm sure... so you
have to  
adapt your changes to the new sources.  look at the man page
for diff  
and patch... 

You can also look at the diff from 1.0.0 to 1.0.2a to help
you see  
what changed in the original sources.

As for maintaining the sets of sources, you might want to
look into  
SVK, which can mirror a svn repo... and then you could step
one patch  
at a time into your own local tree.

I'd recommend reading the svn book at http://svnbook.red-bean.
com/   
and then reading the similar docs for svk.






>
>
>
> -------- Original Message --------
> Subject: 	howto 'retrofit' a vendor branch?
> Date: 	Mon, 27 Aug 2007 09:59:31 -0400
> From: 	Aaron Bennett <abennettclarku.edu>
> To: 	userssubversion.tigris.org
>
>
>
> Hello,
>
> I think this is a newbie question, but I can't figure
out how to
> accomplish this.  Here's my problem...
>
> We've got a fairly hacked version of an open source
package that we  
> rely
> on.  ( maia mailguard, as a point of interest ).  The
problem is, now
> that we've got it customized, the vendor has released
at least two
> smallish-but-significant dot releases.  We're running a
customized  
> 1.0.0
> and current rev is 1.0.2.  When I first hacked it, I
just hacked each
> file as needed until it did what I wanted, as if I'd
never heard of
> 'source control' or 'change management' before in my
life. (!)
>
> Now, however, I want to bring my changed version of
1.0.0 up to 1.0.2.
> I'm not _entirely_ sure of what files I hacked in 1.0.0
-- it's not a
> ton of them, but both the interface and the underlying
stuff was
> modified quite a bit to fit into our environment and to
satisfy the
> demands of our user support team.
>
> Sounds like a job for... SUBVERSION, right?  RIGHT. 
Especially since
> the maia guys use svn to maintain the project.
>
> So I got svn installed and working and read the
'Version Control with
> Subversion' book on red-bean.com.  Awesome book and
many thanks to the
> authors, by the way.  It seems to me after reading that
I ought to  
> treat
> the official dist of maia as a vendor branch in my main
project.
>
> here's what I've done...
>
> 1.  I created the suggested skeleton, maia/trunk ,
maia/branches,
> maia/tags, maia/vendor.
> 2.  from my source directory, svn import https://svn/maia/trunk
> 3.  grab maia 1.0.2 source, svn import https://svn/vendor/1.0.2

> 4.  check out trunk as working copy svn co https://svn/maia/trunk; 

> cd trunk
>
> ok, now here's where I get messed up -- time to merge,
right?
>
> 4.  svn merge https://svn/maia/vendor
/1.0.2 https://svn/maia/trunk
>
> what I get is:
> [abennettwide trunk]$ svn merge https://svn/maia/vendor
/1.0.2
> https://svn/maia/trunk
> Skipped missing target: 'LICENSE'
> Skipped missing target: 'maia-mysql.sql'
> Skipped missing target: 'amavisd-maia'
> Skipped missing target: 'maia-pgsql.sql'
> Skipped missing target: 'amavisd.conf.dist'
> Skipped missing target: 'README'
> Skipped missing target: 'maia.conf.dist'
> Skipped missing target: 'reference'
>
> ( I don't understand that, I want to MERGE those
missing files into  
> the
> trunk... why is it skipping them? )
>
> then, instead of merging the vendor's changes on all of
the files, it
> deletes all of the old files and replaces them with new
ones.  why?
>
> for example:
>
> D    php/error.php
> D    php/welcome.php
> D    php/confirm.php
> D    php/auth.php
> D    php/adminhelp.php
> D    php/xadminusers.php
> D    php/mailtools.php
> D    php/view.php
> D    php
> A    php
> A    php/error.php
> A    php/welcome.php
> A    php/confirm.php
> A    php/auth.php
> A    php/adminhelp.php
> A    php/xadminusers.php
> A    php/mailtools.php
> A    php/view.php
>
>
> I'm obviously missing something.  I thought, maybe I'm
going the wrong
> way, and I want instead svn merge https://svn/maia/trunk
> https://svn/maia/vendor
/1.0.2 . but that doesn't work either... it
> correctly adds the new files, but still deletes all of
the old  
> stuff and
> re-adds it instead of merging.
>
> help!  It's clear that I'm confused, that's all that's
clear though.
>
> Thanks for your time,
>
> Aaron Bennett
> Unix Administrator
> Clark University ITS
>
>
------------------------------------------------------------
---------
> To unsubscribe, e-mail: users-unsubscribesubversion.tigris.org
> For additional commands, e-mail: users-helpsubversion.tigris.org
>
>
> _______________________________________________
> Maia-users mailing list
> Maia-usersrenaissoft.com
> http://www.renaissoft.com/mailman/listinfo/maia-users

David Morton
Maia Mailguard http://www.maiamailguard
.com
mortondadgrmm.net



-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFG05ioUy30ODPkzl0RAvqJAJ0Q2zf8bebnS3qMObyUCLIP80GBRgCe
IRwW
KpTjE1R5MXXg9dn17/9sx5g=
=lf74
-----END PGP SIGNATURE-----
_______________________________________________
Maia-users mailing list
Maia-usersrenaissoft.com
http://www.renaissoft.com/mailman/listinfo/maia-users