From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: Git List <git@vger.kernel.org>, Stephen Beyer <s-beyer@gmx.net>,
Christian Couder <chriscool@tuxfamily.org>,
Sverre Rabbelier <srabbelier@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [GSoC 2011] Git Sequencer
Date: Mon, 4 Apr 2011 10:24:41 +0530 [thread overview]
Message-ID: <20110404045437.GA2208@kytes> (raw)
In-Reply-To: <20110404040610.GA30737@kytes>
Hi Daniel,
Ramkumar Ramachandra writes:
> Daniel Barkalow writes:
> > I actually think that it would be a worthwhile feature for git's library
> > code to have a uniform mechanism for communicating that it is requesting
> > human intervention in the middle of a particular operation, where library
> > operations which conflict with being able to continue this operation are
> > either blocked or abort the operation, and the library is able to be told
> > in general that the human intervention is done and the library operation
> > should be finished now (or produce complaints about the user's work). That
> > is, a library-level, single-interrupted-step "sequencer". For that matter,
> > it should also apply to the common '"git merge" gets a conflict' case, and
> > it would be useful to get some representational uniformity between that
> > and cherry-pick getting a conflict.
[...]
> int sequencer_handle_conflict(); /* Returns ABORT (1) or RESOLVED (0) */
>
> /**
> * The sequencer_handle_conflict function essentially starts with a
> * working tree with unmerged files and results in either a working
> * tree without unmerged files (in which case it returns 0), or simply
> * returns 1. Advantage: Consistency. Each individual script will not
> * have to maintain its own temporary files.
> */
Uh, no. I wrote this part in too quickly. Clearly needs more
thought.
-- Ram
next prev parent reply other threads:[~2011-04-04 4:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-03 17:20 [GSoC 2011] Git Sequencer Ramkumar Ramachandra
2011-04-03 17:24 ` Sverre Rabbelier
2011-04-03 19:07 ` Stephan Beyer
2011-04-03 20:00 ` Ramkumar Ramachandra
2011-04-03 20:08 ` Jonathan Nieder
2011-04-03 19:49 ` Daniel Barkalow
2011-04-04 4:06 ` Ramkumar Ramachandra
2011-04-04 4:54 ` Ramkumar Ramachandra [this message]
2011-04-04 18:59 ` Daniel Barkalow
2011-04-05 17:50 ` Ramkumar Ramachandra
2011-04-05 18:24 ` Daniel Barkalow
2011-04-05 18:59 ` Ramkumar Ramachandra
2011-04-04 4:43 ` Christian Couder
2011-04-04 5:20 ` Junio C Hamano
2011-04-05 6:23 ` Christian Couder
2011-04-05 6:46 ` Ramkumar Ramachandra
2011-04-04 16:57 ` Ramkumar Ramachandra
2011-04-05 20:00 ` [GSoC 2011 v2] " Ramkumar Ramachandra
2011-04-06 8:11 ` Christian Couder
2011-04-06 9:01 ` Ramkumar Ramachandra
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=20110404045437.GA2208@kytes \
--to=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=s-beyer@gmx.net \
--cc=srabbelier@gmail.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).