From: Petr Baudis <pasky@suse.cz>
To: Jan Nieuwenhuizen <janneke-list@xs4all.nl>
Cc: git@vger.kernel.org
Subject: Re: TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies.
Date: Tue, 12 Aug 2008 15:38:57 +0200 [thread overview]
Message-ID: <20080812133857.GL32184@machine.or.cz> (raw)
In-Reply-To: <1218546106.7264.11.camel@heerbeest>
Hi,
On Tue, Aug 12, 2008 at 03:01:46PM +0200, Jan Nieuwenhuizen wrote:
> I have been trying to adapt my ooo-build export to topgit
> instead of plain git and ran into the (documented and
> expected) merge conflicts in .top*.
>
> After unsuccesfully trying to script around it in my
> gob git-export script, I found that this simple tg-create.sh
> seems to work for me: just remove any <<<,===,>>> from
> .topdeps and simply generate the new .topmgs later.
>
> What do you think? Is this naive way of 'auto' resolving
> dependency problems doing the right thing?
how exactly did you get the morge conflicts? These should never happen
- I don't think we document them either? Pre-0.2 TopGit with dash as
/bin/sh had a bug that caused the conflicts to still happen, but that
should've been fixed (check if your .git/info/attributes does not
contain '-e' at the line beginnings ;-).
--
Petr "Pasky" Baudis
The next generation of interesting software will be done
on the Macintosh, not the IBM PC. -- Bill Gates
next prev parent reply other threads:[~2008-08-12 13:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 13:01 TOPGIT: [PATCH] tg create: add --force option to resolve merge dependencies Jan Nieuwenhuizen
2008-08-12 13:38 ` Petr Baudis [this message]
2008-08-12 15:02 ` Jan Nieuwenhuizen
2008-08-12 17:55 ` Bert Wesarg
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=20080812133857.GL32184@machine.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=janneke-list@xs4all.nl \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.