Subject: Re: [boost] [git] [conversion] Schedule and remaining showstoppers?
From: Beman Dawes (bdawes_at_[hidden])
Date: 2013-10-16 13:13:33
On Wed, Oct 16, 2013 at 12:45 PM, Niall Douglas
> On 16 Oct 2013 at 17:03, Jonathan Wakely wrote:
> > On 16 October 2013 15:18, Beman Dawes wrote:
> > > 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
> > > 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.)
> > I assume 85994 is an svn revision, so to git merge it you need to know
> > the Git SHA1 commit ID for that commit. You can find that via "git
> > log" and looking for the relevant commit message, but you can't just
> > merge 85994 without some extra work.
> git lets you create arbitrary refs to arbitrary SHAs, so there is
> absolutely nothing stopping Boost2Git filling a directory of SHA refs
> named after each SVN revision e.g. refs/svnrefs/12345 => abcdef...
What is stopping us from doing that is simply that our Boost2Git developers
Looking at the "git log" as Jonathan described is just fine for the handful
of times this will have to be done.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk