When I had a big upgrade with changes in the code and configurations, I tried
rebasing which generated lots of conflicts, so that I gave up on that approach.
So I listed all the files that had changes and handcrafted the changes into the
new version - that was painful
Patching is one way to do it and the Quilt tool sounds interesting - I will
keep that in mind for my next big upgrade,
Another similar approach is to list the changes in your branch and
cherrypicking the commits in reverse order. This should work if there are only
few commits.
If you truly have only changes in configs and you are not quite sure whether
they are all properly versioned (I do sometimes muck around in the deployed
/dspace/config files), you could do the following trick:
put the config files in the deployment directory under git:
cd /dspace/config
git init
git add .
git commit
then compile the new version of the code
deploy
have a look at the differences with git and transport them back into the code
base
Monika
—
Monika Mevenkamp
Digital Repository Infrastructure Developer
Princeton University
Phone: 609-258-4161
Skype: mo-meven
> On Sep 15, 2016, at 1:20 AM, Ilja Sidoroff <ilja.sidor...@uef.fi> wrote:
>
>
> I started with having a separate repository and a shell script that copied
> changed files from that repository to the original sources, which IMO works
> well as long as you don't make too many changes to the code.
>
> After I started having more changes in the code, not only in configuration, I
> started using patches. I have a DSpace git-tree, from where I generate
> patches for my changes. I then store the patches to a different repository
> and use quilt to apply them to the original sources.
>
> br,
>
> Ilja Sidoroff
> University of Eastern Finland
>
> From: dspace-tech@googlegroups.com <dspace-tech@googlegroups.com> on behalf
> of Christoph Weber <weber.christ...@gmail.com>
> Sent: Wednesday, September 14, 2016 4:31:38 PM
> To: DSpace Technical Support
> Subject: [dspace-tech] How to organize customizations in dspace?
>
> Hello,
>
> I'm currently setting up our dspace instance and doing a few changes to
> customize it. Till. ex. some changes in
> [dspace-source]/config/input-forms.xml and
> [dspace-source]/config/registries/dublin-core-types.xml to support DOI.
> Now I wonder what the best way is to preserve this changes after an update of
> dspace in the future. Its not something specific to a theme as far as I know,
> where I simply can put my customizations in [dspace-source]/themes/... as an
> overlay and use them again in the future.
>
> I want to keep my dspace repository as standard as possible to avoid any
> hassles on the next update. So what is the best way to do that without
> needing do merge all my changes manually to the new source code?
>
> Best regards,
> Christoph
>
>
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "DSpace Technical Support" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to
> dspace-tech+unsubscr...@googlegroups.com<mailto:dspace-tech+unsubscr...@googlegroups.com>.
> To post to this group, send email to
> dspace-tech@googlegroups.com<mailto:dspace-tech@googlegroups.com>.
> Visit this group at https://groups.google.com/group/dspace-tech.
> For more options, visit https://groups.google.com/d/optout.
>
> --
> You received this message because you are subscribed to the Google Groups
> "DSpace Technical Support" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to dspace-tech+unsubscr...@googlegroups.com.
> To post to this group, send email to dspace-tech@googlegroups.com.
> Visit this group at https://groups.google.com/group/dspace-tech.
> For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups
"DSpace Technical Support" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to dspace-tech+unsubscr...@googlegroups.com.
To post to this group, send email to dspace-tech@googlegroups.com.
Visit this group at https://groups.google.com/group/dspace-tech.
For more options, visit https://groups.google.com/d/optout.
