The idea here is that, in order to perform vendor branching, you want to copy data from VuFind’s public SVN repository into your own local repository.  Thus, you need to create a working directory from YOUR repository, and then populate it with data from the public VuFind repository.  That’s why you need to use “export” instead of “checkout” – if you checked out a copy, the SVN metadata from the public repository would conflict with the SVN metadata from your local repository.  Does that make any sense?  I’ve just slightly tweaked the wording in the wiki in an effort to make this more comprehensible…  but it’s inherently a bit confusing!

 

- Demian

 

From: Lovins, Daniel [mailto:daniel.lovins@yale.edu]
Sent: Tuesday, November 30, 2010 3:52 PM
To: Demian Katz; mikan.d.dspace listmail
Cc: vufind-tech@lists.sourceforge.net; Lovins, Daniel
Subject: RE: [VuFind-Tech] Migrating changes between Vufind versions

 

Hi Demian.  Doesn’t using the ‘svn export’ (vs. checkout) command prevent the new directory from being a working copy? In which case, the command “svn copy vendor trunk” (in a subsequent step) generates the error message:  “svn: '.' is not a working copy” ?

 

Or am I missing something?

 

Thanks.

 

 

Daniel

 

From: Demian Katz [mailto:demian.katz@villanova.edu]
Sent: Tuesday, November 30, 2010 3:25 PM
To: mikan.d.dspace listmail
Cc: vufind-tech@lists.sourceforge.net
Subject: Re: [VuFind-Tech] Migrating changes between Vufind versions

 

I’ve added some commands showing how to set up Option A in a clean repository here:

 

http://vufind.org/wiki/subversion#option_arely_on_subversion

 

In a complex, real-world situation, the “svn merge” command at the end may blow up with too many conflicts and problems to practically resolve…  but if your changes are simple enough, this is an easy solution.  If you can’t get option A to work, option B should work with similar SVN commands… just in a slightly different order.

 

Either way, once you have things set up, running a merge periodically should keep you up to date…  and if you run into a weird merge problem, feel free to post on this list to get help.

 

Let me know if this helps or if you still have questions!

 

- Demian

 

From: mikan.d.dspace listmail [mailto:mikan.dspace@gmail.com]
Sent: Tuesday, November 30, 2010 8:47 AM
To: Demian Katz
Cc: vufind-tech@lists.sourceforge.net
Subject: Re: [VuFind-Tech] Migrating changes between Vufind versions

 

I tried the vendor branching method described in VuFind wiki, but didnt quite manage to accomplish on my task. :)

I pretty much know the basic use of svn (add, commit, checkout and update), but somehow I manage to mess things up with branching and copy. I usually end up in a situation where I get strange errors like "this is not a working copy" or "cannot copy ." etc.

Could you add a command-line examples to your wiki-page, to show exactly how  you branch your distributions?

thanks,
Mika

2010/11/17 Demian Katz <demian.katz@villanova.edu>

Since this question comes up from time to time, I have added some notes to the wiki:

 

http://vufind.org/wiki/subversion#upgrading_an_old_custom_vufind_version_using_subversion

 

Please take a look and let me know if you have questions.  Also be aware that we’re hoping to gradually make it easier to extend the VuFind code without introducing lots of merge conflicts.  Stay tuned on this list (and, if timing permits, the developers call - http://vufind.org/wiki/developers_call) for further discussion of this in the coming months.

 

- Demian

 

From: mikan.d.dspace listmail [mailto:mikan.dspace@gmail.com]
Sent: Wednesday, November 17, 2010 7:40 AM
To: vufind-tech@lists.sourceforge.net
Subject: [VuFind-Tech] Migrating changes between Vufind versions

 

Hi,

What would be the best option to migrate the changes and customizations done locally, to a new Vufind codebase downloaded from SVN?

Thanks,
Mika