[Expo-tech] loser git conversion

[Wookey]

On 2020-05-03 04:49 +0100, Wookey wrote:

> post-2001 fixed by:
> looking for 2000-aa-01 instead of 2000-AA-01

OK. doing it this way conflicts later so change to re-case the file
instead which is better (I only did it the first way as I thought that
would avoid conflicts).

> So I've pushed a '2001' branch (to avoid clashing with the tag 'post-2001' - my git-fu doesn;t run to distinguishing between branch refs and tag refs with the same name) with a working version, which should probably be folded back in at the post-2001 tag.

Rebasing 2002 onto that 2001 makes it work too.

> I wonder what else is missing... Worth checking survey dates I guess
> to see what should be promoted forwards in the dataset.

There are no files dated 2001 that appear between them. So that looks good.

Trying same for 2003 (rebase on top of fixed 2002) gets to the tricky
bit. Most conflicts are the stuff fixed above already for 2001 and are
auto-merged. Good. But the 'Gap' checkin does al sorts of stuff.

This looks like a combination of
1) big rework so southern end (078, 041, 115 get 80s CUCC
data removed and new ARGE stuff used. Fine.
2) leading zeros on cave dirs dropped.

However there seems to be a revision to older versions of files:
In 115 and 41 it's reverting comment-> *title and date -> *date stuff and
removing umlauts which it shouldn't be. (maybe that really did happen, but it shouldn't have).

Also various other things:
caves/115/115.log gets in - shouldn't be there.
files like caves/40/arge/.nfs* and caves/40/arge/.*.svx.swp and caves/40/arge/__svxtmp.svx appear
lots of trailing spaces and tabs in added 144 files. yuk.
removes 40area.svx, .gitignore adds cvsignore

It possible (likely even) that all this reversion to older files gets
dealt with later. Needs some investigation to work out what the right
set of changes is that will work, accurately represent the year and
not conflict with lots of stuff later.

Sending this now as you said you were going to do some more. I'll look
some more too to try and work out what's what, but not necessarily tonight if you are.

This 2002(CVS) to 2003(SVN) jump is the main tricky bit I think, until whatever happens after 2015.


Wookey
-- 
Principal hats:  Linaro, Debian, Wookware, ARM
http://wookware.org/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.wookware.org/pipermail/expo-tech/attachments/20200503/c4ebf3b7/attachment.sig>