How to merge a complicated mess

[Harvey Chapman]

> On Feb 27, 2015, at 4:55 PM, Harry Putnam <reader at newsguy.com> wrote:
> ...
> Until by now the files contain quite a lot of different stuff.  And
> what is the same may not be in the same order.
> ...
> 
>  Keywords: some key words about this bit of info
>      keydate (when the snippet got saved)
>  body
>  body
>  [...]
>  &&
> 
> ...
> So, cutting to the chase:  How would I go about merging the various
> (same name but different host and partially different content) files
> ...
> All I can think of is having to do it all by hand which sounds like a
> lot of time and effort.  And maybe not worth it

Try pulling them into one repo and find yourself a nice graphical merge tool for your OS.

Or… perhaps you need a database and not a version control system, or some combination of the two.

> If I did manage to get the files merged, I guess, then I would want to
> have a master repo for such files where files would be checked out and
> re committed with any changes from whatever host.

Once merged, put your master repo up on bitbucket or some network accessible mercurial location. Sync up regularly.

> That would be on the cvs model... Is that something people do with merc?

Absolutely.

Good luck,
Harvey