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). 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. ĸen -- If a man stands before a mirror and sees in it his reflection, what he sees is not a true reproduction, but a picture of himself when he was a younger man. -- de Selby -- http://lists.linuxfromscratch.org/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
