* spurious fail of git merge after rebasing
@ 2011-04-15 22:45 D. A. van Delft
2011-04-18 6:10 ` Jeff King
2011-04-18 7:37 ` Danny van Delft
0 siblings, 2 replies; 3+ messages in thread
From: D. A. van Delft @ 2011-04-15 22:45 UTC (permalink / raw
To: git
Hi,
not sure if this is the right place, but I couldn't find a
bugzilla or something for git.
Point is, I have found a scenario where sometimes git fails on
a specific merge.
Each time I start with the same identical git repository
(archived once and restored each time before a run) and run
the same fixed series of rebases and merges on it. Once in a
while it fails with a merge conflict, sometimes at first try,
sometimes after 10+ times. I have a canned set of testcases
which reproduces this behaviour. I have also narrowed it down
somewhat on how to work around, or prevent it from occurring.
However, given that it doesn't always fail or succeed, is
unexpected.
regards,
Danny A. van Delft
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: spurious fail of git merge after rebasing
2011-04-15 22:45 spurious fail of git merge after rebasing D. A. van Delft
@ 2011-04-18 6:10 ` Jeff King
2011-04-18 7:37 ` Danny van Delft
1 sibling, 0 replies; 3+ messages in thread
From: Jeff King @ 2011-04-18 6:10 UTC (permalink / raw
To: D. A. van Delft; +Cc: git
On Sat, Apr 16, 2011 at 12:45:12AM +0200, D. A. van Delft wrote:
> Point is, I have found a scenario where sometimes git fails on
> a specific merge.
> Each time I start with the same identical git repository
> (archived once and restored each time before a run) and run
> the same fixed series of rebases and merges on it. Once in a
> while it fails with a merge conflict, sometimes at first try,
> sometimes after 10+ times. I have a canned set of testcases
> which reproduces this behaviour. I have also narrowed it down
> somewhat on how to work around, or prevent it from occurring.
>
> However, given that it doesn't always fail or succeed, is
> unexpected.
Yeah, git should generally be deterministic. Can you show us your test
case?
-Peff
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: spurious fail of git merge after rebasing
2011-04-15 22:45 spurious fail of git merge after rebasing D. A. van Delft
2011-04-18 6:10 ` Jeff King
@ 2011-04-18 7:37 ` Danny van Delft
1 sibling, 0 replies; 3+ messages in thread
From: Danny van Delft @ 2011-04-18 7:37 UTC (permalink / raw
To: git
[-- Attachment #1: Type: Text/Plain, Size: 1180 bytes --]
Added attachment contains testcases, in three separate dirs.
I came about this problem during development of a script that
generates git commands to rebase a graph, with all its wanted
sub graphs, starting at one commit onto another commit. The
"runtest" script is the output of this script, hence the
strange looking branchnames during its operation.
regards,
--
Danny
Op zaterdag 16 april 2011 om 00:45 schreef D. A. van Delft:
> Hi,
>
> not sure if this is the right place, but I couldn't find a
> bugzilla or something for git.
>
> Point is, I have found a scenario where sometimes git fails
> on a specific merge.
> Each time I start with the same identical git repository
> (archived once and restored each time before a run) and run
> the same fixed series of rebases and merges on it. Once in
> a while it fails with a merge conflict, sometimes at first
> try, sometimes after 10+ times. I have a canned set of
> testcases which reproduces this behaviour. I have also
> narrowed it down somewhat on how to work around, or
> prevent it from occurring.
>
> However, given that it doesn't always fail or succeed, is
> unexpected.
>
> regards,
> Danny A. van Delft
[-- Attachment #2: TestCases.tgz --]
[-- Type: application/x-compressed-tar, Size: 33304 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-18 7:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-15 22:45 spurious fail of git merge after rebasing D. A. van Delft
2011-04-18 6:10 ` Jeff King
2011-04-18 7:37 ` Danny van Delft
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).