On Wed, Sep 07, 2005 at 02:33:42PM -0400, Daniel Barkalow wrote:
On Wed, 7 Sep 2005, Fredrik Kuivinen wrote:
Of the 500 merge commits that currently exists in the kernel
repository 19 produces non-clean merges with git-merge-script. The
four merge cases listed in
[EMAIL PROTECTED
On Thu, Sep 08, 2005 at 11:27:35AM -0400, Daniel Barkalow wrote:
...
The two cases my algorithm merges cleanly and git-resolve-script do
not merge cleanly are 0e396ee43e445cb7c215a98da4e76d0ce354d9d7 and
0c168775709faa74c1b87f1e61046e0c51ade7f3. Both of them have two common
ancestors.
On Thu, Sep 08, 2005 at 12:16:05PM -0500, Darrin Thompson wrote:
On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote:
I've got a version of read-tree which accepts multiple ancestors and does
a merge using information from all of them.
Do the multiple ancestors have to share a common
Hi,
Here is the new version of the merge algorithm patch.
The major changes compared to the previous patch are:
* No more messing around with merge-cache. git-ls-files used to get
the unmerged entries instead.
* The python code is now contained in two files, git-merge-script and
This will be used by the merge code.
Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED]
---
read-tree.c | 13 +++--
1 files changed, 11 insertions(+), 2 deletions(-)
12d226103dc278c5d5aaf6b2dc776af3170ed233
diff --git a/read-tree.c b/read-tree.c
--- a/read-tree.c
+++ b/read-tree.c
The new algorithm handles multiple common ancestors in a better way.
Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED]
---
Makefile |3
git-merge-script | 491 +
gitMergeCommon.py | 286 +++
3
On Sun, Sep 04, 2005 at 11:48:08AM -0700, Junio C Hamano wrote:
Fredrik Kuivinen [EMAIL PROTECTED] writes:
In non-english locales diff(1) do sometimes output \ No newline at end of
file in some other language. Set LC_ALL to C before execing diff to avoid
this behaviour.
Signed-off
In non-english locales diff(1) do sometimes output \ No newline at end of
file in some other language. Set LC_ALL to C before execing diff to avoid
this behaviour.
Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED]
---
diff.c |1 +
1 files changed, 1 insertions(+), 0 deletions
The message \ No newline at end of file which sometimes is produced
by diff(1) is locale dependent. We can't assume more than that it
begins with \ .
Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED]
---
The previous patch wasn't doing the right thing. Hopefully I have
managed to get it right
On Sun, Sep 04, 2005 at 12:25:16PM -0700, Junio C Hamano wrote:
Fredrik Kuivinen [EMAIL PROTECTED] writes:
The message \ No newline at end of file which sometimes is produced
by diff(1) is locale dependent. We can't assume more than that it
begins with \ .
Signed-off-by: Fredrik
On Sat, Sep 03, 2005 at 11:46:53AM -0700, Junio C Hamano wrote:
[lots of good stuff]
I obviously misunderstood the complexity of this merge case. Thank you
for the explanation.
- Fredrik
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
On Sat, Aug 27, 2005 at 10:23:23PM -0700, Junio C Hamano wrote:
Fredrik Kuivinen [EMAIL PROTECTED] writes:
The main changes compared to the previous version are:
* Lots of clean up.
* Some of the scripts have been renamed to better match the naming
convention used in Git.
* A new
to
keep some state between different cache entries.
- Fredrik
Signed-off-by: Fredrik Kuivinen [EMAIL PROTECTED]
---
Makefile |3 -
git-merge-files-script | 188
git-merge-script | 94
gitMergeCommon.py | 86
On Fri, Aug 26, 2005 at 04:48:32PM -0400, Daniel Barkalow wrote:
On Fri, 26 Aug 2005, Fredrik Kuivinen wrote:
I will try to describe how the algorithm works. The problem with the
usual 3-way merge algorithm is that we sometimes do not have a unique
common ancestor. In [1] B and C seems
On Fri, Aug 26, 2005 at 06:08:33PM -0700, Junio C Hamano wrote:
Linus Torvalds [EMAIL PROTECTED] writes:
On Fri, 26 Aug 2005, Fredrik Kuivinen wrote:
In real numbers it is as follows: In Linus' kernel tree there are
5996 commits. 400 of those have more than one parent. Of those 400
On Wed, Jul 20, 2005 at 01:58:11AM +0200, Petr Baudis wrote:
Dear diary, on Fri, Jul 15, 2005 at 02:46:42AM CEST, I got a letter
where Fredrik Kuivinen [EMAIL PROTECTED] told me that...
Hi,
Hello from a lazy reader who didn't actually try it,
Gct v0.1 has been released and can
with Python 2.3, Qt 3.3.4 and PyQt 2.13. Other
fairly recent versions may or may not work.
- Fredrik Kuivinen
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
17 matches
Mail list logo
