> "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
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, but I don't see such script.
I wrote a script that would do that. I'm still not fully familiar with
the concepts of cogito, so maybe w
On Mon, 4 Jul 2005, Junio C Hamano wrote:
> > "DB" == Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> DB> Junio: what's missing from annotate/blame?
>
> Which one are you talking about?
>
> What I use to generate http://members.cox.net/junkio/Summary.txt
> is an implementation of an algorit
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 change restores the order in which start points are presented to the
the merge-order sort algorithm (but leaves the order unchang
Ok,
I've written a "git-fetch-pack" along the lines I outlined a few days
ago, ie the person doing the fetching ends up listing the commits it has,
and then both ends negotiate the missing objects.
It's probably buggy in many ways, but I actually used it to fetch the last
merge with Russell K
> "DSM" == David S Miller <[EMAIL PROTECTED]> writes:
DSM> Looks interesting. Any particular reason to use "cpio"
DSM> instead of "cp"?
No particular reason other than I am just used to doing things
that way.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a
> "DB" == Daniel Barkalow <[EMAIL PROTECTED]> writes:
DB> Junio: what's missing from annotate/blame?
Which one are you talking about?
What I use to generate http://members.cox.net/junkio/Summary.txt
is an implementation of an algorithm I consider "complete" in
that it does rename/copy and co
From: Junio C Hamano <[EMAIL PROTECTED]>
Date: Mon, 04 Jul 2005 14:40:11 -0700
> > "DSM" == David S Miller <[EMAIL PROTECTED]> writes:
>
> DSM> I keep hoping git-clone-script is going to be a good way
> DSM> to clone two local trees. Is my hope misguided? :-)
>
> Something along these line
On Mon, 4 Jul 2005, Linus Torvalds wrote:
> On Mon, 4 Jul 2005, Daniel Barkalow wrote:
> >
> > How about an option to git-rev-list to take a path, and (1) exclude any
> > branch where the version at that path ends up ignored in a merge and
> > (2) not list any revision where the version at that p
On Mon, 4 Jul 2005, Daniel Barkalow wrote:
>
> How about an option to git-rev-list to take a path, and (1) exclude any
> branch where the version at that path ends up ignored in a merge and
> (2) not list any revision where the version at that path is identical to a
> parent?
Hmm. How is that d
> "DB" == Daniel Barkalow <[EMAIL PROTECTED]> writes:
DB> On Wed, 29 Jun 2005, Junio C Hamano wrote:
>> - Blame/Annotate. Does anybody have a fast and correct one
DB> How about an option to git-rev-list to take a path, and (1) exclude any
DB> branch where the version at that path ends up ign
On Mon, 4 Jul 2005, David S. Miller wrote:
>
> I keep hoping git-clone-script is going to be a good way
> to clone two local trees. Is my hope misguided? :-)
Well, I'm not working on it, but tested patches...
Linus
-
To unsubscribe from this list: send the line "unsubscribe g
On Wed, 29 Jun 2005, Junio C Hamano wrote:
> - Blame/Annotate. Does anybody have a fast and correct one
How about an option to git-rev-list to take a path, and (1) exclude any
branch where the version at that path ends up ignored in a merge and
(2) not list any revision where the version at tha
> "DSM" == David S Miller <[EMAIL PROTECTED]> writes:
DSM> I keep hoping git-clone-script is going to be a good way
DSM> to clone two local trees. Is my hope misguided? :-)
Something along these lines?
Short-cut "git fetch" when cloning locally.
Instead of calling local-pull t
From: Petr Baudis <[EMAIL PROTECTED]>
Date: Mon, 4 Jul 2005 22:42:35 +0200
> Dear diary, on Mon, Jul 04, 2005 at 10:39:09PM CEST, I got a letter
> where Linus Torvalds <[EMAIL PROTECTED]> told me that...
> > That said, the pack-file thing I'm working on won't be perfect either, and
> > the main ad
s should not be a problem. Just undo and try again if you
> don't like the result.
I uploaded a new snapshot (stgit-20050704.tar.gz) which has support for
merge tool configuration. It installs a default /etc/stgitrc file but
you can define your own options in ~/.stgitrc or .git/stgitrc
Dear diary, on Mon, Jul 04, 2005 at 10:39:09PM CEST, I got a letter
where Linus Torvalds <[EMAIL PROTECTED]> told me that...
> That said, the pack-file thing I'm working on won't be perfect either, and
> the main advantage is that it should work over ssh. The fastest way to do
> a clone is really t
On Mon, 4 Jul 2005, David S. Miller wrote:
>
> I can't be the only person in the world seeing this :-)
> It usually grows to around 88MB and runs for 8 minutes before
> it finishes.
I'm making something based on pack-files.
git-local-pull is indeed walking the whole tree and copying one file a
If a program locks a refs file (as git-ssh-pull -w now does for an
existing file), it should unlock it again if it exits without changing
it. Some trickiness is required to make this not happen in forks of the
process.
Signed-off-by: Daniel Barkalow <[EMAIL PROTECTED]>
---
commit 8934c88118c900fe
If git-ssh-push can't interpret the commit-id, there are various possible
issues. Just giving the usage message makes it hard to identify what could
be wrong.
Signed-off-by: Daniel Barkalow <[EMAIL PROTECTED]>
---
commit 7a274ce1f93e6092dcf226d546a58d2d6df9d13c
tree 1f045fa8aa017cabbac613cf8c1ea2
I'm still seeing git-local-pull going crazy when attemping local
clones of kernel trees, this is from top:
22032 davem 18 0 63392 59m 920 R 76.0 5.9 5:33.15 git-local-pull
and it's still chugging along. This is from a simple:
bash$ git-clone-script /home/davem/src/GIT/linux-2.6
Initial version of support for transferring pack files over ssh. This works
by sending the source hashes that the target already has, and checking (in
bulk) whether the source has them as well. If the source has some hash that
the target has, the target will request a pack for the fetch, instead of
Add support for the pull common code to specify to a pull implementation
hashes which wouldn't be useful to fetch implicitly. This can be used to
infer (possibly) what hashes would be useful to fetch implicitly, such that
a later call to fetch can also fetch extra stuff.
Signed-off-by: Daniel Bark
This series allows git-ssh-* to transfer objects packed into pack files in
the case of updating a ref file. It is a proof-of-concept for transferring
pack files in any situation where it's useful.
The general method is that the fetch() method has the option of
additionally getting other objects in
On 04 Jul 2005 14:32:36 +0200 Peter Osterlund wrote:
| Catalin Marinas <[EMAIL PROTECTED]> writes:
|
| > On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote:
| > > Catalin Marinas <[EMAIL PROTECTED]> writes:
| > > > I know that using -A gives a more detailed output in case of a conflict.
| >
On Mon, Jul 04, 2005 at 04:36:37PM +0200, Matthias Urlichs wrote:
> Ideally, I'd prefer to recycle standard CVS options as much as possible,
> but given that the confusion is already there (worse: cvs' -z wants an
> argument (compression level), cvsps' -Z doesn't) that may not actually
> make sens
Hi,
Sven Verdoolaege:
> > Because my code doesn't support compressed cvs connections:
> > a -z that doesn't work except for the rlog part would be a lie.
>
> I was talking about the cvsps '-z' option (see current git-cvsimport-script).
> Are you saying you want to reserve that option to signify c
git-cvsimport-script: update cvsps cache instead of rebuilding it
Updating the cache is sufficient for most purposes.
If users really want to rebuild the cache, they can specify
the option themselves.
---
commit 6e7e37b0bfc921aa1f0cb30560fc128e87a41966
tree 12a9303d4ba4566d9e081b2c375648685ce41e9
git-cvsimport-script: fix branch switching
Previous patch broke branch switching.
---
commit 46e63efc072bc440e4c6aad33d3157b70f5172b6
tree 2c4fd7286e29e6041808d07874ef2151e3876676
parent 79ee456cf222982f7ee3f003440c57b5f7cffa8b
author Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 15:28:36
On Mon, Jul 04, 2005 at 03:53:27PM +0200, Matthias Urlichs wrote:
> Hi,
>
> Sven Verdoolaege:
> > Why not an explicit '-z' option as in the current git-cvsimport-script ?
>
> Because my code doesn't support compressed cvs connections:
> a -z that doesn't work except for the rlog part would be a l
Hi,
Sven Verdoolaege:
> Why not an explicit '-z' option as in the current git-cvsimport-script ?
Because my code doesn't support compressed cvs connections:
a -z that doesn't work except for the rlog part would be a lie.
Feel free to add that code. ;-)
--
Matthias Urlichs | {M:U} IT Design
On Thu, Jun 30, 2005 at 11:00:23PM +0200, Matthias Urlichs wrote:
> Sven Verdoolaege:
> > It would also be nice if the user could pass extra options
> > to cvsps (notably '-z').
> >
> Ditto. ;-)
Why not an explicit '-z' option as in the current git-cvsimport-script ?
skimo
-
To unsubscribe from
This patch fixes up the t/t5300 unit tests which were broken by the changes in:
Make the name of a pack-file depend on the objects packed there-in.
Signed-off-by: Jon Seymour <[EMAIL PROTECTED]>
---
t/t5300-pack-object.sh | 30 +++---
1 files changed, 15 inser
Catalin Marinas <[EMAIL PROTECTED]> writes:
> On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote:
> > Catalin Marinas <[EMAIL PROTECTED]> writes:
> > > I know that using -A gives a more detailed output in case of a conflict.
> > > The problem is that you will get a conflict even if the chang
git-cvsimport-script: use private index.
---
commit 79ee456cf222982f7ee3f003440c57b5f7cffa8b
tree c27c7f8bafa48d81a4d9f7562b851681984a9c7e
parent 2eb6d82eaa869a1faf4ba3326fd628f76f9f93a8
author Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 13:36:59 +0200
committer Sven Verdoolaege <[EMAIL
git-cvsimport-script: leave working directory alone.
---
commit 2eb6d82eaa869a1faf4ba3326fd628f76f9f93a8
tree 3e59c8c298e51a8ae20102b4b139c84c79fa54a0
parent 866d13108e969773347828daa9b7f3476ec70cb8
author Sven Verdoolaege <[EMAIL PROTECTED]> Mon, 04 Jul 2005 00:43:26 +0200
committer Sven Verdoola
Hi,
On Mon, Jul 04, 2005 at 03:49:48AM +0200, Matthias Urlichs wrote:
> Sven Verdoolaege:
> > Note how the patchsets with the same date have somehow
> > been reversed. Any ideas ?
> >
> No. I process the lines from cvsps in the order I get them...
>
Ok, I reran cvs2git and now I get the same o
37 matches
Mail list logo
