From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "David Kågedal" <davidk@lysator.liu.se>
Cc: git@vger.kernel.org
Subject: Re: [StGit PATCH 0/6] Use git conflict handling on push
Date: Thu, 23 Aug 2007 15:54:51 +0100 [thread overview]
Message-ID: <b0943d9e0708230754r533f7749l63b5e2ba9a5dcfe8@mail.gmail.com> (raw)
In-Reply-To: <11875975232619-git-send-email-davidk@lysator.liu.se>
On 20/08/07, David Kågedal <davidk@lysator.liu.se> wrote:
> This series of patches updates "stg push" to leave conflicts in the
> index, in the normal git fashion.
Thanks for this series. I'll give it a try (importing it from the kha
branch as it is easier) and check other issues it might break.
> This means that conflict handling and resolution are handled by git
> and not stg, which should make it possible to simplify stg quite a
> bit. For instance, the 'conflicts' file should go away.
Yes, indeed.
> Unfortunately, this patch series isn't complete, since it doesn't
> remove all uses of the stg merge code. The remaining client of that
> code is the "sync" command, which I have never used, and haven't
> studied very much. But if that command is changed somehow, then most
> of the code in gitmergeonefile.py will go simply away.
I still like to keep the interactive merging from that file.
> https://gna.org/task/?5140
BTW, would you like to be added as a project member at gna.org/projects/stgit?
Regards.
--
Catalin
prev parent reply other threads:[~2007-08-23 14:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 8:11 [StGit PATCH 0/6] Use git conflict handling on push David Kågedal
2007-08-20 8:11 ` [StGit PATCH 1/6] Split git.merge into two functions David Kågedal
2007-08-20 8:11 ` [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged David Kågedal
2007-08-20 8:12 ` [StGit PATCH 3/6] Don't touch state after conflict in push David Kågedal
2007-08-20 8:12 ` [StGit PATCH 4/6] Added a test case to check what happens when push finds a conflict David Kågedal
2007-08-20 8:12 ` [StGit PATCH 5/6] Simplify merge_recursive David Kågedal
2007-08-20 8:12 ` [StGit PATCH 6/6] Use the output from merge-recursive to list conflicts David Kågedal
2007-08-22 9:21 ` [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged Karl Hasselström
2007-08-22 9:37 ` David Kågedal
2007-08-22 9:44 ` Karl Hasselström
2007-08-22 9:59 ` Karl Hasselström
2007-08-22 10:29 ` [StGIT PATCH] Leave working dir and index alone after failed (conflicting) push Karl Hasselström
2007-08-20 8:55 ` [StGit PATCH 1/6] Split git.merge into two functions David Kågedal
2007-08-20 23:52 ` Junio C Hamano
2007-08-21 19:35 ` Uwe Kleine-König
2007-08-22 10:04 ` Junio C Hamano
2007-08-22 9:17 ` [StGit PATCH 0/6] Use git conflict handling on push Karl Hasselström
2007-08-23 14:54 ` Catalin Marinas [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b0943d9e0708230754r533f7749l63b5e2ba9a5dcfe8@mail.gmail.com \
--to=catalin.marinas@gmail.com \
--cc=davidk@lysator.liu.se \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).