Last weekend was the summer bank holiday weekend. We spent bank holiday Monday at Hinton Ampner, a National Trust property in Hampshire. Apart from a few spots of rain every now and then, the weather stayed dry and the sun put in a few appearances!
We spent a few hours in the gardens while Angharad completed an activity sheet. The gardens were very lovely with woods, a tennis court and ornamental lawns.
Johnathon had some fun pretending to be a fountain! I’m quite pleased with how the photo came out; he and I will have to try some more perspective shots like this in the future!
An avenue of trees presented another photo opportunity.
We saw a few butterflies, as well, including a small tortoiseshell and a peacock. Tortoiseshells are fairly common in England, but I can’t remember ever seeing a peacock butterfly, so this was quite special.
We also spent some time looking round the house; the kids both had activity sheets, which really helped keep their interest. The Trust doesn’t normally allow photography inside its properties, so no photos of the inside.
All in all, it was a lovely day out!
I used WinMerge to compare the contents of two folders; there were a large number of text files in both sides that were different simply because a version number had been updated. With so many different files showing, it was difficult to determine which files actually needed to be copied from one side to the other.
I already knew WinMerge had the ability to filter various types of file, but what I didn’t know was that WinMerge can filter lines within a file as well. So, let’s say a text file in the left folder contains a line like:
Build : spf_12208
and the matching text file in the right folder has a similar line:
Build : spf_12230
Without a line filter, this would be highlighted as a difference. To remove this sort of difference, add a line filter as follows:
- In WinMerge, click Tools -> Filters.
- Click on the Linefilters tab.
- Make sure Enable Line Filters is ticked.
- Click New
- In the edit box, enter a regular expression:
- Click OK.
Depending on the exact filter (and whether there are other differences in the file), you should now see a dialog indicating that the files are identical. Identical files can be hidden by unchecking Show Identical Items on the View menu.