Menu
▾
▴
Re: [VuFind-Tech] Differences between v2.3 tarball and git
|
From: Demian K. <dem...@vi...> - 2015-03-23 14:11:08
|
Working on packaging release 2.4 refreshed my memory on this issue -- I now recall the reason for this inconsistency. When I worked on release-2.3, I had a branch for the release and forgot that the build.xml package task hard-coded packaging from master instead. Thus, a few changes beyond what I had intended went into the release. I subsequently discovered this and changed the build script to use HEAD instead of master, so the problem should never happen again (at least, not for the same reason!) - Demian > -----Original Message----- > From: Demian Katz [mailto:dem...@vi...] > Sent: Friday, March 20, 2015 10:49 AM > To: Oliver Obenland; vuf...@li... > Subject: Re: [VuFind-Tech] Differences between v2.3 tarball and git > > Hmm... I'm seeing the same thing that you are, but I can't explain it. I tried > the same experiment with the 2.3.1 release, and those match up exactly, so it > seems that something went wrong with the 2.3 release, but there doesn't seem > to be an inherent flaw in our release process. > > How have you customized your instance? If you've kept your local changes > isolated from the core, then I wouldn't expect that you'll have too much > trouble reconciling things. > > - Demian > ________________________________________ > From: Oliver Obenland [oli...@un...] > Sent: Friday, March 20, 2015 10:12 AM > To: Demian Katz; vuf...@li... > Subject: Re: [VuFind-Tech] Differences between v2.3 tarball and git > > Hi Demian, > > no, there are changes, like deleting and adding translations to language files > or refactorings but also little changes in functionality. > > Ignoring white spaces, tabs and co.: > $ diff -rqiEZbwB vufind2 vufind-2.3/ | wc -l > 187 > > - Oli > > Am 20.03.2015 um 14:43 schrieb Demian Katz: > > Have you looked at what the changes actually are? Is it possible it's > something simple, like inconsistent line endings? > > > > - Demian > > ________________________________________ > > From: Oliver Obenland [oli...@un...] > > Sent: Friday, March 20, 2015 9:41 AM > > To: Demian Katz; vuf...@li... > > Subject: Re: [VuFind-Tech] Differences between v2.3 tarball and git > > > > Ok, hier are the steps I did: > > > > Get the tarball copy > > $ wget -O vufind2.3.tar.gz > http://downloads.sourceforge.net/vufind/vufind-2.3.tar.gz?use_mirror=osdn > > $ tar -zxvf vufind2.3.tar.gz > > > > Get the git clone of tag v2.3: > > $ git clone https://github.com/vufind-org/vufind.git vufind2 > > $ cd vufind2 > > $ git checkout tags/v2.3 > > > > Check the git clone > > $ git log | head -n 3 > > commit ae84e7286dd7236dae08d12c9e86bb61bc17f5bf > > Author: Demian Katz <dem...@vi...> > > Date: Fri Aug 8 09:20:06 2014 -0400 > > > > Get the number of file with changes: > > $ diff -rq vufind2 vufind-2.3/ | wc -l > > 187 > > > > So there are 187 files with changes. Config, language files, VuFind modules, > themes. So the git clone is more than 200 changes away from the base where we > started. Maybe I have to merge all of our changes by hand, but this sounds > like to much work for such a simple task for me. > > > > Thanks, > > Oliver Obenland > > > > > > > > Am 20.03.2015 um 13:05 schrieb Demian Katz: > > > >> The v2.3 tarball should be equivalent to the v2.3 tag in GitHub. However, > one possible source of confusion is the release-2.3 branch. When we make a > release, we start a release branch that is then used to apply patches, etc. So > if you compared the v2.3 tarball against the release-2.3 branch, you would > indeed find differences, because release-2.3 is now equivalent to the v2.3.1 > release. > >> > >> Does that clarify anything? > >> > >> In any case, if differences do indeed exist, it is not intentional and may > be a side effect of the build process. Following Oliver Schihin's suggested > procedure is definitely a good way to proceed if you can't find a better > approach. And to extend his suggestion, I'd recommend starting your branch in > your forked repo at tag v2.3, then apply your changes, then merge master to > get up to date. (Obviously, whenever you merge master, it's also a good idea > to review the diffs to see if any of your custom theme files or extensions > need to be adjusted to keep in sync). > >> > >> - Demian > >> ________________________________________ > >> From: Oliver Obenland [oli...@un...] > >> Sent: Friday, March 20, 2015 5:41 AM > >> To: vuf...@li... > >> Subject: [VuFind-Tech] Differences between v2.3 tarball and git > >> > >> Hi there, > >> > >> we used the v2.3 tarball to set up our system. Now the requirements > >> changed and we want to get updates from the git repository. > >> First I tried to get the v2.3 tarball again and a copy of the git > >> repository (at tag v2.3). I made a patch of our changes and applied > >> it to the git clone. I expected that both copies are equal, but they > >> aren't. So the patch failed. > >> > >> Why are these copies not equal? Do you have any advice for me on how > >> to switch to the git clone? > >> Thanks, > >> Oliver Obenland > >> > >> --------------------------------------------------------------------- > >> --------- Dive into the World of Parallel Programming The Go Parallel > >> Website, sponsored by Intel and developed in partnership with > >> Slashdot Media, is your hub for all things parallel software > >> development, from weekly thought leadership blogs to news, videos, > >> case studies, tutorials and more. Take a look and join the > >> conversation now. http://goparallel.sourceforge.net/ > >> _______________________________________________ > >> Vufind-tech mailing list > >> Vuf...@li... > >> https://lists.sourceforge.net/lists/listinfo/vufind-tech > >> > > ------------------------------------------------------------------------------ > Dive into the World of Parallel Programming The Go Parallel Website, sponsored > by Intel and developed in partnership with Slashdot Media, is your hub for all > things parallel software development, from weekly thought leadership blogs to > news, videos, case studies, tutorials and more. Take a look and join the > conversation now. http://goparallel.sourceforge.net/ > _______________________________________________ > Vufind-tech mailing list > Vuf...@li... > https://lists.sourceforge.net/lists/listinfo/vufind-tech |