Comments on: subversion vendor branches in action – going from 0.7 to 0.8.5 of acts_as_solr http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/ Late nights eventually pay off Sat, 06 Mar 2010 19:40:48 +0000 http://wordpress.org/?v=abc hourly 1 By: Mike http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-2212 Mike Tue, 29 Apr 2008 00:33:02 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-2212 Heya, nice post. There is an easier way to accomplish your option 1 that we use to import vendor updates. 1. Checkout your vendor branch 2. Unpack the new vendor src to a local dir 3. Use your favorite folder compare tool to sync the vendor working copy with the new src. We are on Win and use BeyondCompare and just have to tell it to exclude .svn directories. It overwrites files and removes any files or directories in the old version that aren't in the new src. 4. Now just commit your vendor branch and voila! :) Cheers, Mike G. Heya, nice post. There is an easier way to accomplish your option 1 that we use to import vendor updates.
1. Checkout your vendor branch
2. Unpack the new vendor src to a local dir
3. Use your favorite folder compare tool to sync the vendor working copy with the new src. We are on Win and use BeyondCompare and just have to tell it to exclude .svn directories. It overwrites files and removes any files or directories in the old version that aren’t in the new src.
4. Now just commit your vendor branch and voila! :)

Cheers, Mike G.

]]> By: Micah http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-1034 Micah Sat, 10 Nov 2007 22:02:29 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-1034 Hmm, using rsync is a neat idea. The only thing that will be lost is history from a copy/rename. Since none of the other methods can handle that automatically either, it's not much of a loss. Thanks Christian! Hmm, using rsync is a neat idea. The only thing that will be lost is history from a copy/rename. Since none of the other methods can handle that automatically either, it’s not much of a loss.

Thanks Christian!

]]> By: Christian G. Warden http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-1018 Christian G. Warden Sat, 10 Nov 2007 00:23:59 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-1018 I haven't looked at svn_load_dirs, but here's how I've down a vendor upgrade: 1. tar xvzf vendor-new.tar.gz 2. svn co file:///path/to/vendor/current 3. cd current 4. rsync -avC --delete ../vendor-new/ . 5. svn st | grep '^!' | cut -c2-100 | xargs svn rm 6. svn st | grep '^\?' | cut -c2-100 | xargs svn add 7. svn ci -m'upgrade to vendor-new' 8. svn cp -m'tag new' . file:///path/to/vendor/new I haven’t looked at svn_load_dirs, but here’s how I’ve down a vendor upgrade:
1. tar xvzf vendor-new.tar.gz
2. svn co file:///path/to/vendor/current
3. cd current
4. rsync -avC –delete ../vendor-new/ .
5. svn st | grep ‘^!’ | cut -c2-100 | xargs svn rm
6. svn st | grep ‘^\?’ | cut -c2-100 | xargs svn add
7. svn ci -m’upgrade to vendor-new’
8. svn cp -m’tag new’ . file:///path/to/vendor/new

]]> By: Mike Howarth: Web Developer» Blog Archive » Third party SVN imports http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-907 Mike Howarth: Web Developer» Blog Archive » Third party SVN imports Tue, 23 Oct 2007 11:50:16 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-907 [...] Aisle Ten had the same problem. See solution 2 [...] [...] Aisle Ten had the same problem. See solution 2 [...]

]]> By: Jak na pluginy a větve se subversion? http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-688 Jak na pluginy a větve se subversion? Sat, 04 Aug 2007 23:27:13 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-688 [...] aktualizovat plugin na nejnovější verze, doporučuji články how to create a vendor branch a how to update a vendor branch, ve kterých se dozvíte, jak toto vyřešit ručně za pomoci [...] [...] aktualizovat plugin na nejnovější verze, doporučuji články how to create a vendor branch a how to update a vendor branch, ve kterých se dozvíte, jak toto vyřešit ručně za pomoci [...]

]]> By: Midnight Oil » Blog Archive » Integrating Beast forum into a Ruby on Rails app - part 1 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-348 Midnight Oil » Blog Archive » Integrating Beast forum into a Ruby on Rails app - part 1 Wed, 04 Jul 2007 18:49:44 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-348 [...] have already covered how to do a vendor branch and how to upgrade using a vendor branch, so go browse those posts if you don’t know what I’m talking [...] [...] have already covered how to do a vendor branch and how to upgrade using a vendor branch, so go browse those posts if you don’t know what I’m talking [...]

]]> By: Chris Hasenpflug http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-225 Chris Hasenpflug Wed, 20 Jun 2007 00:28:21 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-225 I too got frustrated with svn_load_dirs at first, it was a confusing beast. But, this website really helped me out: http://burtonini.com/blog/computers/svn-vendor-2005-05-04-13-55 And know the documentation makes more sense. It would be nice if the graphical clients had something for this, but its pretty much something that can be scripted on the command line and run with one double-click. I too got frustrated with svn_load_dirs at first, it was a confusing beast. But, this website really helped me out:

http://burtonini.com/blog/computers/svn-vendor-2005-05-04-13-55

And know the documentation makes more sense.

It would be nice if the graphical clients had something for this, but its pretty much something that can be scripted on the command line and run with one double-click.

]]> By: Micah http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-214 Micah Tue, 19 Jun 2007 12:08:39 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-214 @Chris, I think you're right, but I'm not sure. I've played with the svn_load_dirs script and I quickly got frustrated, so I quit. It's probably time for me to revisit it and see if I can puzzle it out. I wish some of the graphical clients had scripts or tools for doing a vendor branch update. It seems like a common thing. @Chris,

I think you’re right, but I’m not sure. I’ve played with the svn_load_dirs script and I quickly got frustrated, so I quit. It’s probably time for me to revisit it and see if I can puzzle it out.

I wish some of the graphical clients had scripts or tools for doing a vendor branch update. It seems like a common thing.

]]> By: Chris Hasenpflug http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-212 Chris Hasenpflug Tue, 19 Jun 2007 06:24:05 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-212 Wouldn't the svn_load_dirs.pl script do the import/merge/tag process for you? Essentially it follows the same steps with one command, no? Wouldn’t the svn_load_dirs.pl script do the import/merge/tag process for you? Essentially it follows the same steps with one command, no?

]]> By: Micah http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-101 Micah Tue, 22 May 2007 19:24:21 +0000 http://blog.aisleten.com/2007/05/18/subversion-vendor-branches-in-action-going-from-07-to-085-of-acts_as_solr/#comment-101 @Francois I've looked at Piston, and while I'm intrigued, there were a few things that scared me away. 1. I sort of like to do some things by hand. Vendor branches are delicate enough that I want to know what's going on. 2. I often modify the plugin code, and Piston had this caveat: "If a file was locally modified, its changes will be merged back in. If that produces a conflict, Piston will not detect it. However, the next commit will be rejected by Subversion." I didn't know what "Piston will not detect it" meant, and I decided not to risk finding out. Still, Piston does look very intriguing and deserves mention as a reasonable alternative to the solutions presented above. Thanks for the comment! @Francois

I’ve looked at Piston, and while I’m intrigued, there were a few things that scared me away.

1. I sort of like to do some things by hand. Vendor branches are delicate enough that I want to know what’s going on.

2. I often modify the plugin code, and Piston had this caveat:

“If a file was locally modified, its changes will be merged back in. If that produces a conflict, Piston will not detect it. However, the next commit will be rejected by Subversion.”

I didn’t know what “Piston will not detect it” meant, and I decided not to risk finding out.

Still, Piston does look very intriguing and deserves mention as a reasonable alternative to the solutions presented above.

Thanks for the comment!

]]>