On 11/17/2018 11:37 PM, Ken Moffat via blfs-dev wrote:
On Sat, Nov 17, 2018 at 10:38:07PM -0600, Bruce Dubbs via blfs-dev wrote:
On 11/17/2018 05:18 PM, Ken Moffat via blfs-dev wrote:
That was absolutely horrid. First, merge requires the revision
numbers (I sort-of expected that, and was ready). But secondly, it
handles the same thing in both tree (added, or moved, files) really
badly. After going with 'r' (accept current working copy state) I
thought I had fixed jansson, cbindgen, libaio, But at one of tte
gnome-theses I had to enter my passphrase many times while svn
looked at different revisions before eventually allowing me to
accept incoming deletion.
[...]
The files in the branch were complete, weren't they? I just would have
copied the files from branch to trunk.
cd ~/BLFS/trunk/BOOK/general/prog
svn cp ~/BLFS/branches/perl-modules/general/prog/perl-modules .
etc
I was not aware of 'svn cp', and you didn't mention it when I set
out what I planned to do.
The problem with svn, in general, is that it is obscure and very
poorly documented (in particular, things which are claimed to work
might not work in BLFS).
Poorly documented? Try http://svnbook.red-bean.com/en/1.7/index.html
I've had that as a bookmark for a loong time.
Also note in the Editor's guide:
http://www.linuxfromscratch.org/blfs/edguide/chapter03.html
That also has a link to the subversion documentation in the Introduction
section. That link is to an older version, but the basics haven't changed.
Anyway, it is done now. But if you mention making a branch for
future changes which are intended to end up in trunk, I'll be gone.
Just for info, when I release a new version of one of the books, I use a
checklist that starts out:
1. In sandbox:
cd ~/LFS/tags
svn cp ../trunk/BOOK new-tag
edit general.ent and edit
version (x.y-rc?), short-version, generic-version, releasedate
edit packages.ent and make permanent BOOTSCRIPTS-
{SIZE,MD5SUM,INSTALL-KB}
edit changelog with release entry
commit
I admit that I do not try to merge anything from there back into trunk.
To me, merging is like a patch; you are only updating parts of a file.
If the file in the branch is correct and complete, then to me copying is
the obvious (and simpler) way to go.
-- Bruce
PS: Thank you for all the work you have done to modernize the Perl
modules. It looks good.
--
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
