Service disruption: git converter currently down
emaste at freebsd.org
Tue Oct 1 13:39:43 UTC 2019
On Mon, 30 Sep 2019 at 15:17, Ryan Stone <rysto32 at gmail.com> wrote:
> On Thu, Sep 26, 2019 at 10:27 AM Ed Maste <emaste at freebsd.org> wrote:
> > If you try this in a tree with changes (i.e., try applying it to a
> > long-running merge-based branch) every modified file will result in a
> > conflict, but they can be trivially resolved in favour of the first
> > version. From that point on merging from the "new" conversion will
> > work as expected.
> You don't have to do this manually. "git merge -s ours
> origin/svn_head" will record a merge but will not make any changes to
> the local tree.
Thanks Ryan. So that can be used to trivially accommodate changed
hashes in a merge-workflow long-lived downstream project (with the
downside that two copies of every commit after the divergence will
appear in vanilla `git log`).
For a rebase-workflow branch `git rebase --onto` can be used to move
commits across a set of changed hashes. For example, assuming we have
a branch with commits on top of on origin/master they can be moved to
git rebase --onto origin/svn_head origin/master
More information about the freebsd-git