[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: State of the repository conversion
From: |
Stefan |
Subject: |
Re: State of the repository conversion |
Date: |
Fri, 21 Mar 2014 08:40:45 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
> What bzrmerge.el does, when we merge a fix from the branch, is
> effectively a cherry-pick,
No, bzrmerge does not cherry pick in any sense of the word. It does
a merge. The only difference with "bzr merge" is that it does it with
more care, using hints from the commit messages to try and auto-resolve
some conflicts.
> I'm not sure this will work with git, btw.
There's nothing special in bzrmerge that should prevent it from working
in another VCS, so long as that VCS has a notion of "branch merge", basically.
E.g. I'm pretty sure we could have written a corresponding cvsmerge.el,
and AFAIK some other project has written something similar for svn.
Stefan
- Re: State of the repository conversion, (continued)
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/20
- Re: State of the repository conversion, Stefan, 2014/03/20
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/20
- Re: State of the repository conversion, Steinar Bang, 2014/03/20
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/20
- Re: State of the repository conversion, Steinar Bang, 2014/03/20
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/21
- Re: State of the repository conversion,
Stefan <=
- Re: State of the repository conversion, Steinar Bang, 2014/03/21
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/21
- Re: State of the repository conversion, David Kastrup, 2014/03/21
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/21
- Re: State of the repository conversion, David Caldwell, 2014/03/21
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/20
- Re: State of the repository conversion, Óscar Fuentes, 2014/03/20
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/20
- Re: State of the repository conversion, Óscar Fuentes, 2014/03/20
- Re: State of the repository conversion, Eli Zaretskii, 2014/03/20