DB == Daniel Barkalow [EMAIL PROTECTED] writes:
DB [perl script]
How does this work, and what do we do about merges?
DB I've got that part, but I'm not clear on how the rename/copy and complete
DB rewrite stuff works.
Rename/copy is simply about what files to use when comparing
between two
Dear diary, on Tue, Jul 05, 2005 at 07:46:12AM CEST, I got a letter
where Pavel Roskin [EMAIL PROTECTED] told me that...
Hello!
Hello,
It would be useful to have a script to display current status of the
repository - branches, current branch and merge status. Maybe I'm
missing something,
On 7/5/05, Petr Baudis [EMAIL PROTECTED] wrote:
Any reason why this was not applied? It appears kind of cool. Well, I
will probably take it and extend cg-mkpatch with it so I don't need it
in Git, but I'm so altruistic and want to bring at least a bit of light
to the gloomy dark world of the
Linus Torvalds [EMAIL PROTECTED] writes:
(And you might also change tag contents occasionally. One reason might be
a bug and you decide to re-tag something else. But a more common reason
might be because you want to have tags like latest that don't actually
update with development, but they
--- Junio C Hamano [EMAIL PROTECTED] wrote:
DB == Daniel Barkalow [EMAIL PROTECTED] writes:
DB [perl script]
How does this work, and what do we do about merges?
Checking diffs of all the parents can be computational expensive.
I'am developing a different alghoritm for qgit, where
PB == Petr Baudis [EMAIL PROTECTED] writes:
PB Any reason why this was not applied? It appears kind of cool.
FYI, the one in [EMAIL PROTECTED] is
newer than what you quoted.
One thing _I_ am unhappy about what it does is that it does not
try to be intelligent about merges (I haven't tried the
I just had this ugly merge situation:
M
|\
| \
A B
|\/|
|/\|
C D
| /
|/
E
Suppose both the EC and the ED branch add files (not with conflicting
filenames!) which then get modified somewhere between C/D and M.
No matter which node gets picked as the parent, some files will end
up as
In message [EMAIL PROTECTED] you wrote:
Linus: Please grab http://netz.smurf.noris.de/git/git.git/#cvs2git.
I tested this on the U-Boot CVS repository (available at
http://cvs.sourceforge.net/cvstarballs/u-boot-cvsroot.tar.bz2).
I got:
- ~/test/git-cvsimport-script -d ~/git/u-boot-SF/u-boot
G'day Linus,
Is there some reason why this didn't get applied?
jon.
On 7/5/05, Jon Seymour [EMAIL PROTECTED] wrote:
A recent change to rev-list altered the order in which start points
are presented to the merge-order sort algorithm. This caused
breaks in the t/t6001 unit tests.
This
On Wed, 6 Jul 2005, Jon Seymour wrote:
Is there some reason why this didn't get applied?
I think it's horribly horribly ugly.
I really don't see the point of argument ordering mattering, and I think
the test is broken. Convince me otherwise.
Linus
-
To unsubscribe from
I just hit an interesting pack failure because of how git (mis-)uses zlib,
and I'm wondering what to do about it.
In particular, the git-unpack-objects code gets a data stream, and only
knows the _unpacked_ size of each object, because writing packed size is
extremely inconvenient in many ways
On Wed, 6 Jul 2005, Wolfgang Denk wrote:
I tested this on the U-Boot CVS repository (available at
http://cvs.sourceforge.net/cvstarballs/u-boot-cvsroot.tar.bz2).
Committing initial tree 2183da96d548c02bd4f99b05e673395f81212878
Cannot create object: Too many open files
If you make it
On Tue, 5 Jul 2005, Matthias Urlichs wrote:
I just had this ugly merge situation:
M
|\
| \
A B
|\/|
|/\|
C D
| /
|/
E
Suppose both the EC and the ED branch add files (not with conflicting
filenames!) which then get modified somewhere between C/D and M.
No matter
13 matches
Mail list logo
