Subject: Re: [boost] [GitHelp] (Mis-)Understanding merge
From: Jonathan Wakely (jwakely.boost_at_[hidden])
Date: 2014-02-26 02:19:43
On 26 February 2014 06:50, Edward Diener wrote:
> I was following Modular Boost document "Establishing a merge point after SVN
> Conversion" (https://svn.boost.org/trac/boost/wiki/PostCvtMergePoint) and
> everything appeared to go well. I did my 'merge', 'commit', and 'push'
> specified at the end of the document and things seemed pretty good so I was
> confident I had established a correct merge point.
> Knowing that the latest 'develop' had been pushed and tested I determined to
> update 'master' with the latest 'develop' prior to pushing it. So I did a
> merge from 'develop' to 'master' and after carefully fixing a few minor
> conflicts in favor of the 'develop' versions the merge was successful.
> Yet when I looked at the files involved I noticed that a file which was in
> 'develop' was not in 'master'. How can this be ? If I merge from 'develop'
> to 'master' are not any files in 'develop' which are not in 'master' added
> automatically to 'master' ? If this is not the case it seems that a 'merge'
> is not doing what I expect it to do. Am I really expected to have to
> manually add files to 'master' which are in 'develop' and not in 'master'
> prior to the merge, or I have I missed some 'merge' functionality that would
> have done this for me automatically ?
Could the file have been previously added and then removed from master?
What were the exact commands you ran? What is the file in question?
(It should be possible for everyone else to reproduce the exact same
situation and examine what's going on, which is easier than debugging
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk