From: "Robin Rosenberg (list subscriber)" <robin.rosenberg.lists@dewire.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: cvsps wierdness
Date: Tue, 13 Jun 2006 08:06:20 +0200 [thread overview]
Message-ID: <200606130806.21395.robin.rosenberg.lists@dewire.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0606121406200.5498@g5.osdl.org>
måndag 12 juni 2006 23:27 skrev Linus Torvalds:
[...]
> Does this patch fix it for you (untested - it could result in tons of
> other trouble, but it basically just says that time ordering is less
> important than member revision ordering).
Thanks, it worked on the simple case at least. We'll see about the original
full repo later.
>
> I don't think this is strictly correct, btw. I suspect you can still get
> into strange situations where the changeset merging has resulted in one
> file ordering one way, and another file ordering the other way.
Doesn't cvsps's conflict handing simply break up those patches into several
patches? More patches is ok. Suboptimal patches can be accepted
-- robin
prev parent reply other threads:[~2006-06-13 6:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-12 20:47 cvsps wierdness Robin Rosenberg (list subscriber)
2006-06-12 21:27 ` Linus Torvalds
2006-06-12 21:30 ` Linus Torvalds
2006-06-13 6:06 ` Robin Rosenberg (list subscriber) [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=200606130806.21395.robin.rosenberg.lists@dewire.com \
--to=robin.rosenberg.lists@dewire.com \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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).