Re: [boost] [git] [conversion] Schedule and remaining showstoppers?

On Wed, Oct 16, 2013 at 9:59 AM, Peter Dimov wrote:

Beman Dawes wrote:

...

On Wed, Oct 16, 2013 at 9:18 AM, Peter Dimov wrote:

...

Beman Dawes wrote:

* The moment 1.55 ships, we make the SVN repo read only. As soon as the

...

next conversion run finishes, we turn off the conversion process.

What happens with the changes to trunk that haven't been merged to > release?

For each library, "trunk" will have been renamed "develop", "branches/release" will have been renamed "master"

So a diff of develop vs master on git will show the same changes as a diff of trunk vs branches/release on svn.

A diff will, but diff-ing isn't our procedure now. At least it isn't mine. I keep track of revisions that need to be merged to release. [85994], for example, needs merging.

Ah! I was using diff to illustrate the state of the two branches. The actual way to do the merge is a git question. Like all merges, start by switching to the branch to be merged to - "master" in this case. Then merge from the whole "develop" branch if 85994 is the only difference. Otherwise, you need to merge just the 85994 changeset. (I'm a TortoiseGit user, so am the wrong person to ask about how to do that from the command line. But "git help merge" from the command line may well tell you enough to figure it out.) --Beman