Subject: Re: [boost] [git] mode and whitespace changes remaining between develop and master
From: Ahmed Charles (acharles_at_[hidden])
Date: 2014-01-04 06:32:10
> From: zeratul976_at_[hidden]
> To: boost_at_[hidden]
> Date: Mon, 30 Dec 2013 10:08:52 +0000
> Subject: [boost] [git] mode and whitespace changes remaining between develop and master
> I am trying to follow the instructions for "Establishing a merge point
> after SVN Conversion"  for the Boost.Range library.
> After cherry-picking all the commits to develop that have not been
> merged to master, onto master (all locally, I have not pushed
> anything yet), I am finding that there are still some mode and
> whitespace differences between master and develop (see the diff at
> the bottom of the message). I cannot find the commits that are
> responsible for these changes - is it safe to just ignore them?
I'd recommend doing the merge (with --no-commit) and making sure that the mode for the files is correct (.hpp files don't need to be executable) and that the whitespace is what you want in each case, then commit.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk