Re: kha/safe and kha/experimental updated

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Dec 18, 2007, 16:09 UTC
Message-ID: <b0943d9e0712180809l4d2d01b8j32ab2a410885cc5e@mail.gmail.com>
In-Reply-To: <20071218052115.GA13422@diana.vm.bytemark.co.uk>

Thanks again for maintaining these branches.

On 18/12/2007, Karl Hasselström <kha@treskal.com> wrote:

>   git://repo.or.cz/stgit/kha.git safe
>
> David Kågedal (17):

[...]

>       Simplify merge_recursive
>       Use the output from merge-recursive to list conflicts

I'll drop git.merge() entirely since it is only used by the 'sync' command due to the performance issues I had in the past with rename detection in git-merge-recursive. Hopefully, these are gone now.

I'll try to fix the automatic invocation of the interactive merger in case of conflicts (it is only present in git.merge()).

> Karl Hasselström (24):
>       Fix "stg resolved" to work with new conflict representation

For some reason, the interactive resolving keeps invoking the merger. I'll have a look.

>       "stg status --reset" is not needed anymore

I would keep this as an alias for 'git reset --hard' (see below as well).

>       Remove "stg add"
>       Remove "stg rm"
>       Remove "stg cp"

I plan to add a generic command for these kind of aliases. The reason is that I don't really like mixing GIT and StGIT commands (I think at some point I'll get confused and try to run stg commands with git).

>       Remove "stg resolved"

I'd like to keep this command. git-mergetool doesn't support the tool I use (emacs + ediff and more stgit-specific file extensions like current, patch etc.). I also don't find 'git add' to be meaningful for marking a conflict as solved.

-- 
Catalin