On Mon, 18 Apr 2005, James Bottomley wrote:
It looks like the merge tree has contamination from the scsi-misc-2.6
tree ... possibly because the hosting system got the merged objects when
I pushed.
Nope, the way I merge, if I get a few objects it shouldn't matter at all.
I'll just look at
On Mon, 2005-04-18 at 17:03 -0700, Linus Torvalds wrote:
The patches from you I have in my tree are:
scsi: add DID_REQUEUE to the error handling
zfcp: add point-2-point support
[PATCH] Convert i2o to compat_ioctl
[PATCH] kill old EH constants
[PATCH] scsi:
On Tue, 2005-04-19 at 10:10 +1000, David Woodhouse wrote:
On Mon, 2005-04-18 at 17:03 -0700, Linus Torvalds wrote:
Git does work like BK in the way that you cannot remove history when you
have distributed it. Once it's there, it's there.
But older history can be pruned, and there's really
On Mon, 18 Apr 2005, James Bottomley wrote:
Then the git-pull... script actually does the merge and the resulting
tree checks out against BK
So?
What do you intend to do with all the other stuff I've already put on top?
Yes, I can undo my tree, but my tree has had more stuff in it since I
On Mon, 18 Apr 2005, James Bottomley wrote:
Fair enough. If you pull from
rsync://www.parisc-linux.org/~jejb/scsi-misc-2.6.git
Thanks. Pulled and pushed out.
Doing this exposed two bugs in your merge script:
1) It doesn't like a completely new directory (the misc tree contains a
5 matches
Mail list logo