From: Phillip Wood <phillip.wood@talktalk.net>
To: sxenos@google.com, git@vger.kernel.org
Cc: sbeller@google.com, jrn@google.com, jch@google.com,
jonathantanmy@google.com, stolee@gmail.com, carl@ecbaldwin.net,
dborowitz@google.com
Subject: Re: [PATCH] technical doc: add a design doc for the evolve command
Date: Tue, 20 Nov 2018 12:59:57 +0000 [thread overview]
Message-ID: <8f580b70-3eb2-d751-eb37-6ec025e167ab@talktalk.net> (raw)
In-Reply-To: <a4c5d89c-cf82-6b1d-2690-82c7f8a95cc4@talktalk.net>
On 20/11/2018 12:18, Phillip Wood wrote:
> On 15/11/2018 00:55, sxenos@google.com wrote:
>> From: Stefan Xenos <sxenos@google.com>
>> +Divergence
>> +----------
>> +From the user’s perspective, two changes are divergent if they both
>> ask for
>> +different replacements to the same commit. More precisely, a target
>> commit is
>> +considered divergent if there is more than one commit at the head of
>> a change in
>> +refs/metas that leads to the target commit via an unbroken chain of
>> “obsolete”
>> +edges.
>> +
>> +Much like a merge conflict, divergence is a situation that requires user
>> +intervention to resolve. The evolve command will stop when it encounters
>> +divergence and prompt the user to resolve the problem. Users can
>> solve the
>> +problem in several ways:
>> +
>> +- Discard one of the changes (by deleting its change branch).
>> +- Merge the two changes (producing a single change branch).
>
> I assume this wont create merge commits for the actual commits though,
> just merge the meta branches and create some new commits that are each
> the result of something like 'merge-recursive original-commit
> our-new-version their-new-version'
That should have been
merge-recursive original-commit^ -- our-new-version their-new-version
Best Wishes
Phillip
next prev parent reply other threads:[~2018-11-20 13:00 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-15 0:55 [PATCH] technical doc: add a design doc for the evolve command sxenos
2018-11-15 12:52 ` Johannes Schindelin
2018-11-17 20:30 ` Stefan Xenos
2018-11-19 15:55 ` SZEDER Gábor
2018-11-19 21:32 ` Stefan Xenos
2018-11-20 1:09 ` Jonathan Nieder
2018-11-15 15:36 ` Ævar Arnfjörð Bjarmason
2018-11-20 1:18 ` Jonathan Nieder
2018-11-20 9:43 ` Ævar Arnfjörð Bjarmason
2018-11-20 17:45 ` Stefan Xenos
2018-11-20 22:06 ` Jonathan Nieder
2018-11-20 23:45 ` Stefan Xenos
2018-11-21 1:33 ` Jonathan Nieder
2018-11-21 19:10 ` Stefan Xenos
2018-11-16 21:36 ` Derrick Stolee
2018-11-17 23:44 ` Stefan Xenos
2018-11-17 6:06 ` Duy Nguyen
2018-11-18 22:27 ` Stefan Xenos
2018-11-18 22:29 ` Stefan Xenos
2018-11-18 23:20 ` Junio C Hamano
2018-11-17 7:36 ` Junio C Hamano
2018-11-19 0:36 ` Stefan Xenos
2018-11-19 2:15 ` Junio C Hamano
2018-11-19 3:33 ` Stefan Xenos
2018-11-19 3:45 ` Junio C Hamano
2018-11-19 4:15 ` Junio C Hamano
2018-11-19 20:14 ` Stefan Xenos
2018-11-19 20:26 ` Jonathan Nieder
2018-11-20 1:03 ` Junio C Hamano
2018-11-20 17:27 ` Stefan Xenos
2018-11-20 12:18 ` Phillip Wood
2018-11-20 12:59 ` Phillip Wood [this message]
2018-11-20 20:19 ` Stefan Xenos
2019-01-15 11:16 ` Phillip Wood
2018-11-20 13:03 ` Phillip Wood
2018-11-20 20:24 ` Stefan Xenos
2018-11-21 12:14 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f580b70-3eb2-d751-eb37-6ec025e167ab@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=carl@ecbaldwin.net \
--cc=dborowitz@google.com \
--cc=git@vger.kernel.org \
--cc=jch@google.com \
--cc=jonathantanmy@google.com \
--cc=jrn@google.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sbeller@google.com \
--cc=stolee@gmail.com \
--cc=sxenos@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).