From: Graeme Gregory <dp@xora.org.uk>
To: openembedded-devel@lists.openembedded.org
Subject: Re: Monotone issues
Date: Mon, 4 Feb 2008 10:36:05 +0000 [thread overview]
Message-ID: <20080204103605.3fdfb2e4@cimmeria> (raw)
In-Reply-To: <47A6E7E3.3030600@whitby.id.au>
On Mon, 04 Feb 2008 20:54:35 +1030
Rod Whitby <rod@whitby.id.au> wrote:
> > 2) git 1.4 just threw away your local changes on what git calls a
> > 'merge'
>
> Different tool, different cheat-sheet to learn. That's always to be
> expected when changing tools. Monotone merges are so bad that I
> flatly refuse to even attempt a manual merge, preferring to blow away
> my whole monotone repository and start again rather than try a
> monotone manual merge.
>
This was a bug with git 1.4, totally denied by git developers, but
magically fixed with git 1.5
At least that was my experience of this, I havent seen it since I
started to use git 1.5 and reports on the net dried off after this
point as well.
G
next prev parent reply other threads:[~2008-02-04 10:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-31 23:51 Monotone issues Richard Purdie
2008-02-03 21:03 ` Graeme Gregory
2008-02-04 2:36 ` Michael 'Mickey' Lauer
2008-02-04 8:31 ` Koen Kooi
2008-02-05 8:45 ` Paul Sokolovsky
2008-02-04 8:58 ` Florian Boor
2008-02-04 9:12 ` Rod Whitby
2008-02-04 9:48 ` Koen Kooi
2008-02-04 10:24 ` Rod Whitby
2008-02-04 10:36 ` Graeme Gregory [this message]
2008-02-04 9:52 ` Graeme Gregory
2008-02-04 11:00 ` Michael Krelin
2008-02-05 8:37 ` Paul Sokolovsky
-- strict thread matches above, loose matches on Subject: below --
2008-02-01 10:19 Richard Purdie
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=20080204103605.3fdfb2e4@cimmeria \
--to=dp@xora.org.uk \
--cc=openembedded-devel@lists.openembedded.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 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.