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 th
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, howe
John Ellson <[EMAIL PROTECTED]> writes:
> Do git and cogito build easily on Mac OS/X now? Are there
> binaries available anywhere?
Not that I know of. We used to get portability patches from
Darwin folks, but I haven't seen any lately.
I am somewhat interested in what portability glitches we s
"Luck, Tony" <[EMAIL PROTECTED]> writes:
>>In the meantime, warning the user about the issue and suggesting
>>how to do the fast-forwarding of the working tree himself in the
>>warning message might be the safest and the most sensible thing
>>to do.
>
> Yes please ... a big fat warning with colour
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
The pages under http://www.kernel.org/pub/software/scm/git/docs/
are built from Documentation/ directory of the git.git project
and needed to be kept up-to-date. The www.kernel.org/ servers
are mirrored and I was told that the origin of the mirror is on
the machine master.kernel.org, on which I wa
Now the rebase is rewritten to use git cherry-pick, there is no user
for that ancient script. I've checked Cogito and StGIT to make sure
they do not use it.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
Documentation/git-apply-patch-script.txt | 32
Documentation/git.t
Rewrite "git rebase" using "git cherry-pick".
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
git-rebase-script | 16 ++--
1 files changed, 10 insertions(+), 6 deletions(-)
913404ae6371857c21c696cc3d8b0a04421fdeb2
diff --git a/git-rebase-script b/git-rebase-script
--- a/git
When there is non-empty $GIT_DIR/info/exclude file, use it along
with .gitignore per-directory exclude pattern files (which was
a convention agreed on the list while ago and is compatible with
Cogito) to generate a list of ignored files as well.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
-
The reverse patch application using "git apply" sometimes is too
rigid. Since the user would get used to resolving conflicting merges
by hand during the normal merge experience, using the same machinery
would be more helpful rather than just giving up.
Cherry-picking and reverting are essentially
Add some documentation.
Text taken from the the commit messages and the command sources.
---
I made no attempt to use the proper terminology, as defined by the new
glossary, but instead used the text from the original commit messages and/or
the program source.
These are some of the easy ones. S
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
>> merge commits 4 have more than one shared head.
>
> Ok, that's
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
> merge commits 4 have more than one shared head.
Ok, that's already interesting in itself. I was wanting to re-
On Thu, 25 Aug 2005, Junio C Hamano wrote:
>
> "v0.99.5^0" means "look at the named object v0.99.5, dereference
> it repeatedly until you get a non-tag, and take the result,
> which had better be a commit". If a tag can contain more than
> one pointers, I do not know what it means.
Yeah, we'd
Fredrik Kuivinen <[EMAIL PROTECTED]> writes:
> I find the Git architecture with respect to merging to be quite
> nice. A core which handles the simple cases _fast_ and let the more
> complicated cases be handled by someone else.
Exactly my feeling. The three-way read-tree was made to do
"trivial
On Fri, 26 Aug 2005, Fredrik Kuivinen wrote:
> 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
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 s
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 to be equally good. What this
> algorithm does is to _merge_ the commo
Tony Luck <[EMAIL PROTECTED]> wrote:
> > * Even if it does always choose the nicer choice of the two,
> >Tony was lucky (no pun intended). Rather, we were lucky that
> >Tony was observant. A careless merger may well have easily
> >missed this mismerge (from the human point of view).
Marco Costalba <[EMAIL PROTECTED]> writes:
> 01168c6044e7ebb570e851b4707b4fe0c7f40c15
> diff --git a/templates/blt/description b/templates/blt/description
Could I please see output of the following command in your
repository?
$ git whatchanged 01168c6044e7ebb570e851b4707b4fe0c7f40c15 templates
Hi,
I have for some time now been playing with a new merge algorithm. It
is designed to solve some of the content merges that comes up now and
then. For example the criss-cross merge case described by Bram Cohen
[1], the similar case described by Matthias Urlichs [3] and the merge
case Tony Luck
From: Marco Costalba <[EMAIL PROTECTED]>
Date: 1125080490 +0200
This files are created by 'make' so remove from
repository
Signed-off-by: Marco Costalba <[EMAIL PROTECTED]>
---
This time I send the patch ;-)
templates/blt/description |1 -
templates/blt/hooks/applypatch-msg |
Hi,
$ git status
nothing to commit
$ make clean
rm -f *.o mozilla-sha1/*.o ppc/*.o git-update-cache git-diff-files git-init-db
git-write-tree
git-read-tree git-commit-tree git-cat-file git-fsck-cache git-checkout-cache
git-diff-tree
git-rev-tree git-ls-files git-ls-tree git-merge-base git-merge
>I am tempted to move this logic to "git fetch" instead, because
>it has the same issue. Tony's "linus" branch example has been
>updated to do a "git fetch" instead of "git pull" from the
>earlier description in his howto, but if he happens to be on the
>"linus" branch, he would still have this sa
Johannes Schindelin <[EMAIL PROTECTED]> writes:
> I like it. As Linus stated, the index originally had a different role from
> what it has now, so it really should be an internal git thing, i.e. the
> git user should not expect the index not to change when pulling.
Actually the issue and the wa
On Fri, 26 Aug 2005, Martin Langhoff wrote:
> On 8/26/05, Junio C Hamano <[EMAIL PROTECTED]> wrote:
> > their core GIT tools come from. But how would _I_ pull from
> > that "My Project", if I did not want to pull unrelated stuff in?
>
> and then...
>
> > What I think _might_ deserve a bit more su
[EMAIL PROTECTED] (Eric W. Biederman) writes:
> A nit but possibly an important for 1.0 there are
> quite a few git commands that don't have man pages
> or whose man pages are currently very poor.
>
> Getting the code sane and stable of course comes first
> but if people can't figure out how to us
On Fri, 26 Aug 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > I've started this, and have gotten as far as having read-tree accept > 3
> > trees and ignore everything but the last 3. Am I correct in assuming that
> > if I break read-tree in any way, some test will
Junio C Hamano <[EMAIL PROTECTED]> writes:
> Documentation
> -
A nit but possibly an important for 1.0 there are
quite a few git commands that don't have man pages
or whose man pages are currently very poor.
Getting the code sane and stable of course comes first
but if people can't
Martin Langhoff <[EMAIL PROTECTED]> writes:
> On 8/26/05, Eric W. Biederman <[EMAIL PROTECTED]> wrote:
>> Thinking about it going from arch to git should be just a matter
>> of checking sha1 hashes, possibly back to the beginning of the
>> arch tree.
>
> Yup, though actually replaying the tree to
Hi,
On Thu, 25 Aug 2005, Junio C Hamano wrote:
> This patch is to show my current thinking. Please let me know
> what you think.
I like it. As Linus stated, the index originally had a different role from
what it has now, so it really should be an internal git thing, i.e. the
git user should n
On Fri, Aug 26, 2005 at 07:16:05PM +0800, Sham Chukoury wrote:
> G'day.
>
> I figured you folks might be interested in a number of modifications the
> XMMS2 team have made to gitweb. All the changes can be seen at
> http://git.xmms.se
>
> 1) Navbar refactoring (gitweb-xmms2navbar.diff)
> 3) Sna
G'day.
I figured you folks might be interested in a number of modifications the
XMMS2 team have made to gitweb. All the changes can be seen at
http://git.xmms.se
1) Navbar refactoring (gitweb-xmms2navbar.diff)
The original idea was to add a link to our snapshots directory, in the
navigation
Ignore more generated files.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit 91aeeed108292bb42f7b133da13ec6881cf84a9e
tree fd0dc430a655fde2a21a9634c914b22db0ee96ce
parent c1970992d81e2c26d2d85ad65b0e2e90fbeee7f1
author Tommi Virtanen <[EMAIL PROTECTED]> Fri, 26 Aug 2005 13:34:07 +030
Stylistical improvements on Debian package description.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit 97b501908e075bfd1f97261f94842669e7b4db5b
tree ee48eaa9d8fbf6db7c2a19cfd93de52d60938655
parent 0b1227b120532fe2d8b48ad2d43b2f002241f8d9
author Tommi Virtanen <[EMAIL PROTECTED]> Fri
As long as the cg-cancel name is around, provide docs for it too.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit c1970992d81e2c26d2d85ad65b0e2e90fbeee7f1
tree 461b478052898b2d9cfc67a1b29098abdf5d427e
parent 97b501908e075bfd1f97261f94842669e7b4db5b
author Tommi Virtanen <[EMAIL PROTE
Make the text format docs too.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit 3a0094e4985bcb5970ecee2d59d0ba5f5a806d2d
tree b4d3b267a4b15d3068727fad080c12f6d10a6cd9
parent 91aeeed108292bb42f7b133da13ec6881cf84a9e
author Tommi Virtanen <[EMAIL PROTECTED]> Fri, 26 Aug 2005 13:34:09 +0
As cogito contains only shell scripts, make the deb Arch: all.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit 0b1227b120532fe2d8b48ad2d43b2f002241f8d9
tree 1e00c450a8eb96159f0f5545ce94aabd3a1fcd44
parent 1190649aaff433501d6e6c92deb8a0f201fdd8d0
author Tommi Virtanen <[EMAIL PROTECTE
Make the git deb conflict with cogito versions prior to 0.13, as those
versions used to contain git. Suggest cogito.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit 62e16702fdb0cdc13822470f3a19b36956fd0d78
tree bf96bcbdf1ca99390e6d6cb894da8384270c585f
parent c87030106cfbe39f0ab2ed095
Fix syntax error in debian Build-Depends-Indep, dpkg-checkbuilddeps used
to give false ok results.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit c87030106cfbe39f0ab2ed095f30f576235328fc
tree ca572653ccd5a4c35f9479c079c8a904d6fce2d1
parent 248542ea9ae9125a7ccf214b979ada9908ea1358
au
Point Debian doc-base at the right files. Clean up.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit f4d2a91b2946330c4bf240cf73e64684cba43ddf
tree 8ccdaef874ab4161b7c22206672376fdfc338689
parent 62e16702fdb0cdc13822470f3a19b36956fd0d78
author Tommi Virtanen <[EMAIL PROTECTED]> Fri, 26
Ignore generated files.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit de5b995a65645ecf09bfebff2ba7dc325979e4b3
tree 6a48d6719178c7e0d81cae7683e5b7294ee92781
parent 56bb91cb027a0e0dc8d896d26906597088ee6372
author Tommi Virtanen <[EMAIL PROTECTED]> Fri, 26 Aug 2005 12:32:33 +0300
com
Generate docs for gitk. Install them in the right deb package.
Signed-off-by: Tommi Virtanen <[EMAIL PROTECTED]>
---
commit 56bb91cb027a0e0dc8d896d26906597088ee6372
tree 6be1279d6a87b42e9b726ee7883ebe4e81d1fd01
parent f4d2a91b2946330c4bf240cf73e64684cba43ddf
author Tommi Virtanen <[EMAIL PROTECTE
Hi,
I'm off to the beach for the next two weeks, so if somebody wants to
munge cvs2git into svn2git, here's the basics on how to pull from a
remote SVN repo:
#!/usr/bin/perl
use strict;
use warnings;
use SVN::Core;
use SVN::Ra;
my(@new,@del,@mod);
sub show_log {
my ($changed_paths, $re
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> I've started this, and have gotten as far as having read-tree accept > 3
> trees and ignore everything but the last 3. Am I correct in assuming that
> if I break read-tree in any way, some test will fail?
If some test fails you would know you broke it
On 8/26/05, Junio C Hamano <[EMAIL PROTECTED]> wrote:
> their core GIT tools come from. But how would _I_ pull from
> that "My Project", if I did not want to pull unrelated stuff in?
and then...
> What I think _might_ deserve a bit more support would be a merge
> of a foreign project as a subdi
The reverse patch application using "git apply" sometimes is too
rigid. Since the user would get used to resolving conflicting merges
by hand during the normal merge experience, using the same machinery
would be more helpful rather than just giving up.
Signed-off-by: Junio C Hamano <[EMAIL PROTEC
It had an extra empty '#' line.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
git-commit-script |4 ++--
git-status-script |3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
22758793f9cde4379bacb067e2a4551373eaf073
diff --git a/git-commit-script b/git-commit-script
--- a/
This would be used in places where we require a clean tree, such
as reverting and rebasing.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
git-sh-setup-script | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
1de6046ded332e2278320be314f7a5e31a431e14
diff --git a/git-
When not working on "master" branch, remind the user at the beginning
of the status message, not at the end.
Adjust git-revert-script for this change as well. The way it detected
a clean working tree was depending on the git status behaviour too much.
Signed-off-by: Junio C Hamano <[EMAIL PROTEC
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> I'd still like to revive my idea of having projects overlaid on each
> other, where the commits in the project that absorbed the other project
> say, essentially, "also include this other commit, but any changes to
> those files belong to that branch,
On 8/26/05, Eric W. Biederman <[EMAIL PROTECTED]> wrote:
> Thinking about it going from arch to git should be just a matter
> of checking sha1 hashes, possibly back to the beginning of the
> arch tree.
Yup, though actually replaying the tree to compute the hashes is
something I just _won't_ do ;)
52 matches
Mail list logo
