Comments in read-tree about #nALT

2005-08-27 Thread Daniel Barkalow
I've gotten to the point of having all of the entries for a given path ready to put into the cache at the same, and now I want to convert the merge functions to take their data directly, rather than in the cache, so that they can take extra entries for extra ancestors. Part of threeway_merge,

Re: Merges without bases

2005-08-27 Thread Martin Langhoff
On 8/27/05, Daniel Barkalow [EMAIL PROTECTED] wrote: The problem with both of these (and doing it in the build system) is that, when a project includes another project, you generally don't want whatever revision of the included project happens to be the latest; you want the revision of the

Re: Status of Mac OS/X ports of git and cogito?

2005-08-27 Thread Martin Langhoff
I am running git/cogito on MacOSX 10.3.x mostly as a client, and it works pretty well. My main dev machines are Debian boxes, so the OSX build is most often just fetching commits and running cg-log. So it's not very intensive ;) I get all my build dependencies from Fink, and also get diffutils

[PATCH] git-rev-list: Don't die on a bad tag

2005-08-27 Thread Frank Sorenson
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 The current cogito tree contains an invalid tag (junio-gpg-pub = 0918385dbd9656cab0d1d81ba7453d49bbc16250), and git-repack-script (and probably others) will die when git-rev-list tries to dump the objects. This patch changes it to complain, but

Re: Comments in read-tree about #nALT

2005-08-27 Thread Junio C Hamano
Junio C Hamano [EMAIL PROTECTED] writes: Daniel Barkalow [EMAIL PROTECTED] writes: Part of threeway_merge, however, wants to search the rest of the cache for interfering entries in some cases, which would have to happen differently, because I won't have the cache completely filled out

Re: [PATCH] git-rev-list: Don't die on a bad tag

2005-08-27 Thread Junio C Hamano
Frank Sorenson [EMAIL PROTECTED] writes: The current cogito tree contains an invalid tag (junio-gpg-pub = 0918385dbd9656cab0d1d81ba7453d49bbc16250), and git-repack-script (and probably others) will die when git-rev-list tries to dump the objects. This patch changes it to complain, but

Re: cvsimport error: need a valid pathname

2005-08-27 Thread Martin Langhoff
On 8/28/05, Kalle Valo [EMAIL PROTECTED] wrote: The documentation says that it should be possible to update incrementally from the CVS repository. Am I doing something wrong or is this a bug? It _should_ work the way you are running it, so consider it a bug. Do you think you can do some

Re: cvsimport error: need a valid pathname

2005-08-27 Thread Kalle Valo
Martin Langhoff [EMAIL PROTECTED] writes: On 8/28/05, Kalle Valo [EMAIL PROTECTED] wrote: The documentation says that it should be possible to update incrementally from the CVS repository. Am I doing something wrong or is this a bug? It _should_ work the way you are running it, so consider

Re: Merges without bases

2005-08-27 Thread Daniel Barkalow
On Sat, 27 Aug 2005, Martin Langhoff wrote: On 8/27/05, Daniel Barkalow [EMAIL PROTECTED] wrote: The problem with both of these (and doing it in the build system) is that, when a project includes another project, you generally don't want whatever revision of the included project happens to

[PATCH] A new merge algorithm, take 2

2005-08-27 Thread Fredrik Kuivinen
Hi, I have cleaned up the code for the merge algorithm quite a lot. It is in a much better shape now. 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 option ('-s') has

Re: Comments in read-tree about #nALT

2005-08-27 Thread Linus Torvalds
On Sat, 27 Aug 2005, Daniel Barkalow wrote: What I missed was that the effect of causes_df_conflict is to give no merge for the entry, rather than giving an error overall. So I do need an equivalent. Daniel, I'm not 100% sure what you're trying to do, but one thing that might work out

Re: Comments in read-tree about #nALT

2005-08-27 Thread Daniel Barkalow
On Sat, 27 Aug 2005, Linus Torvalds wrote: On Sat, 27 Aug 2005, Daniel Barkalow wrote: What I missed was that the effect of causes_df_conflict is to give no merge for the entry, rather than giving an error overall. So I do need an equivalent. Daniel, I'm not 100% sure what you're

Re: Make .git directory validation code test HEAD

2005-08-27 Thread Junio C Hamano
Linus Torvalds [EMAIL PROTECTED] writes: This also removes the tests for $GIT_DIR and $GIT_OBJECT_DIRECTORY being directories, since the other tests will implicitly test for that anyway (ie the tests for HEAD, refs and 00 would fail). I've thought about it when you brought up the Andrew's

Re: [PATCH] A new merge algorithm, take 2

2005-08-27 Thread Junio C Hamano
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 option ('-s') has been added to git-merge-cache * Unclean merges are

Re: Comments in read-tree about #nALT

2005-08-27 Thread Junio C Hamano
Daniel Barkalow [EMAIL PROTECTED] writes: What I missed was that the effect of causes_df_conflict is to give no merge for the entry, rather than giving an error overall. So I do need an equivalent. Correct. - To unsubscribe from this list: send the line unsubscribe git in the body of a

[PATCH] acpi_shutdown: Only prepare for power off on power_off

2005-08-27 Thread Linux Kernel Mailing List
tree 26d82a3ea3f1b7be05468ae7e811775851a06731 parent 6a029a90f5b93e2b50bcbbaef05ef91fa0c1d6b3 author Eric W. Biederman [EMAIL PROTECTED] Sat, 27 Aug 2005 12:56:18 -0600 committer Linus Torvalds [EMAIL PROTECTED] Sun, 28 Aug 2005 00:11:40 -0700 [PATCH] acpi_shutdown: Only prepare for power off on

[PATCH] fix for race problem in DVB USB drivers (dibusb)

2005-08-27 Thread Linux Kernel Mailing List
tree c810f8f13be0e2eeec2f0bf9d92b21d746d3f15f parent 820d220de400cfaaf846a2d8b5de93f9ea5a9b80 author Patrick Boettcher [EMAIL PROTECTED] Sat, 27 Aug 2005 19:30:30 +0200 committer Linus Torvalds [EMAIL PROTECTED] Sun, 28 Aug 2005 01:03:45 -0700 [PATCH] fix for race problem in DVB USB drivers

[PATCH] sg.c: fix a memory leak in devices seq_file implementation

2005-08-27 Thread Linux Kernel Mailing List
tree f92ee98a709264984ef6e3e8d6c3ee4f3462797f parent 8126fdbc76351bdf99c6737ef4fecf88a22fa538 author Jan Blunck [EMAIL PROTECTED] Sun, 28 Aug 2005 01:07:52 -0700 committer Linus Torvalds [EMAIL PROTECTED] Sun, 28 Aug 2005 01:22:27 -0700 [PATCH] sg.c: fix a memory leak in devices seq_file

[PATCH] zfcp: add rports to enable scsi_add_device to work again

2005-08-27 Thread Linux Kernel Mailing List
tree a0f09490a7295bab3d299efdae5bd29c55c58c3a parent 729d70f5dfd663b44bca68a4479c96bde7e535d6 author Andreas Herrmann [EMAIL PROTECTED] Sun, 28 Aug 2005 01:07:54 -0700 committer Linus Torvalds [EMAIL PROTECTED] Sun, 28 Aug 2005 01:22:36 -0700 [PATCH] zfcp: add rports to enable scsi_add_device to

[PATCH] 6pack Timer initialization

2005-08-27 Thread Linux Kernel Mailing List
tree 7c1de2aa18081752acf25bba86766d1940b30045 parent 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf author Ralf Baechle [EMAIL PROTECTED] Thu, 25 Aug 2005 19:38:30 +0100 committer Jeff Garzik [EMAIL PROTECTED] Sat, 27 Aug 2005 12:32:39 -0400 [PATCH] 6pack Timer initialization I dropped the timer

[PATCH] Fix 6pack setting of MAC address

2005-08-27 Thread Linux Kernel Mailing List
tree 090a6020ec9c9c4e91615465b54e29084244d9f7 parent 84a2ea1c2cee0288f96e0c6aa4f975d4d26508c7 author Ralf Baechle [EMAIL PROTECTED] Wed, 24 Aug 2005 18:01:33 +0100 committer Jeff Garzik [EMAIL PROTECTED] Sat, 27 Aug 2005 12:32:39 -0400 [PATCH] Fix 6pack setting of MAC address Don't check type of

[PATCH] Remove race between con_open and con_close

2005-08-27 Thread Linux Kernel Mailing List
tree 246cc25d07fc4085b1bf5913f84ffd9c53eef256 parent 3859f6a248cbdfbe7b41663f3a2b51f48e30b281 author Paul Mackerras [EMAIL PROTECTED] Sun, 28 Aug 2005 09:40:01 +1000 committer Linus Torvalds [EMAIL PROTECTED] Sun, 28 Aug 2005 08:03:42 -0700 [PATCH] Remove race between con_open and con_close [