On 09/13/2012 09:33 AM, Peter Krefting wrote:
But this could potentially be dangerous because if "rebase" fires up
a editor for any other reason (e.g. having a "reword" or "squash" in
your recipe), then the commit message will be messed up. So you need
to make sure your recipe won't trigger any
Junio C Hamano wrote:
> Any comment from "git svn" stakeholders on this one?
Looks good to me.
Signed-off-by: Eric Wong
Pushed to master of git://bogomips.org/git-svn.git
(commit 059058765ea2b0abd88001ea1f0f866daf7d0e4c)
Ammon Riley (1):
Make git-svn branch patterns m
I'm awaiting Sam's comment on this patch.
Avishay Lavie wrote:
> Subject: [PATCH] git svn: Only follow first parents when populating
> svn:mergeinfo
> properties.
>
> When svn.pushmergeinfo is set, git-svn tries to correctly populate mergeinfo
> properties when encountering a merge commit. It d
The flag will allow the user to edit the todo file while they're in the middle
of an interactive rebase. It simply invoke the editor and do nothing else.
More discussions here:
http://thread.gmane.org/gmane.comp.version-control.git/205133/focus=205182
Andrew Wong (3):
rebase -i: Ref
Signed-off-by: Andrew Wong
---
git-rebase--interactive.sh | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a09e842..4d57e50 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase
This allows users to edit the todo file while they're stopped in the
middle of an interactive rebase. When this action is executed, all
comments from the original todo file are stripped, and new help messages
are appended to the end.
Signed-off-by: Andrew Wong
---
Documentation/git-rebas
Signed-off-by: Andrew Wong
---
t/t3404-rebase-interactive.sh | 16
1 file changed, 16 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 7304b66..a194c97 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
On 09/16/12 02:54, Junio C Hamano wrote:
> In any case, what information are you discarding and then replacing
> with the standard boilerplate?
It's to strip out the comment that says:
# However, if you remove everything, the rebase will be aborted.
As there's no way reliable way to know wher
Signed-off-by: Andrew Wong
---
git-rebase--interactive.sh | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a09e842..4d57e50 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase
This allows users to edit the todo file while they're stopped in the
middle of an interactive rebase. When this action is executed, all
comments from the original todo file are stripped, and new help messages
are appended to the end.
Signed-off-by: Andrew Wong
---
Documentation/git-rebas
Signed-off-by: Andrew Wong
---
t/t3404-rebase-interactive.sh | 18 ++
1 file changed, 18 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 7304b66..6eafb63 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
ch for master, too. Thanks.
Signed-off-by: Eric Wong
> ---
> perl/Git/SVN.pm |4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> --
I'll apply the following (on top of a patch which fixes some
{path} usages):
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 88b
The accessors should improve maintainability and enforce
consistent access to Git::SVN objects.
Signed-off-by: Eric Wong
---
(RFC since I could've missed something)
Eric Wong wrote:
> I'll apply the following (on top of a patch which fixes some
> {path} usages)
Made the fixes as suggested by Martin.
Martin: Good points. Thanks!
Andrew Wong (3):
rebase -i: Refactor help messages for todo file
rebase -i: Teach "--edit-todo" action
rebase -i: Add tests for "--edit-todo"
Martin von Zweigbergk (1):
rebase usage: subcommands can
message
included
git-rebase [-i] --continue | --abort | --skip
Remove the "[-i]" from this line.
Signed-off-by: Martin von Zweigbergk
Signed-off-by: Andrew Wong
---
git-rebase.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase.sh b/git-rebas
Signed-off-by: Andrew Wong
---
git-rebase--interactive.sh | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a09e842..4d57e50 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase
Signed-off-by: Andrew Wong
---
t/t3404-rebase-interactive.sh | 18 ++
1 file changed, 18 insertions(+)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 7304b66..6eafb63 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
This allows users to edit the todo file while they're stopped in the
middle of an interactive rebase. When this action is executed, all
comments from the original todo file are stripped, and new help messages
are appended to the end.
Signed-off-by: Andrew Wong
---
Documentation/git-rebas
On 09/18/12 00:58, Martin von Zweigbergk wrote:
> On Mon, Sep 17, 2012 at 6:28 PM, Andrew Wong wrote:
>> + test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
>> + test L = $(git cat-file commit HEAD | sed -ne \$p)
> I couldn't find "$" (m
Ammon Riley wrote:
> Branches passed to 'git-svn init' via the -b/--branches flag
> automatically had a /* appended to them. When the branch contained
> a fancy glob with a {} pattern, this is incorrect behaviour, and
> leads to odd branches being created in the git repository.
>
> Signed-off-by
Ammon Riley wrote:
> I confess that I'd completely forgot about the {} expansion in bash.
> Perhaps a note in the CAVEATS section of the documentation would
> be sufficient?
I think so, yes. Can you send a patch for that instead? Thanks.
--
To unsubscribe from this list: send the line "unsubscr
Jonathan Nieder wrote:
> Hi,
>
> Michael G Schwern wrote:
> > On 2012.7.30 12:51 PM, Eric Wong wrote:
> >> Michael G Schwern wrote:
>
> >>> _collapse_dotdot() works better than the existing regex did.
> >>
> >> I don't dispute it
Jonathan Nieder wrote:
> Eric Wong wrote:
> > That said, I'd favor an implementation that split on m{/+} and
> > collapsed as Michael mentioned.
>
> Sounds sensible. Is canonicalize_path responsible for collapsing
> runs of slashes? What should _collapse_do
Jonathan Nieder wrote:
> Maybe we can use apr_filepath_merge() to avoid reinventing the wheel?
Ideally, yes. Is there an easy way to access that from Perl? (and
for the older versions of SVN folks people are running).
Perhaps we can expose equivalent functionality in git via
git-rev-parse inste
I was running into the same issue too. It turns out that on some machines
Shift-F5 is mapped to Shift-XF86_Switch_VT_5. My patch includes a workaround.
The same workaround was used for Shift-F4.
Andrew Wong (1):
gitk: Add workaround for system where Shift-F5 mapped to
Shift-XF86_Switch_VT_5
The same workaround was used for Shift-F4 in:
cea07cf8dc9b3677e0c50433c0d72bce83adbdc7
Signed-off-by: Andrew Wong
---
gitk-git/gitk | 1 +
1 file changed, 1 insertion(+)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index d93bd99..698b84a 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
Sorry, my previous "git send-email" screwed up. Resending the email again.
I was running into the same issue too. It turns out that on some machines
Shift-F5 is mapped to Shift-XF86_Switch_VT_5. My patch includes a workaround.
The same workaround was used for Shift-F4.
Andrew Wong (
The same workaround was used for Shift-F4 in:
cea07cf8dc9b3677e0c50433c0d72bce83adbdc7
Signed-off-by: Andrew Wong
---
gitk-git/gitk | 1 +
1 file changed, 1 insertion(+)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index d93bd99..698b84a 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
Refactored the code for binding modified function keys as Junio suggested.
Andrew Wong (2):
gitk: Refactor code for binding modified function keys
gitk: Use bindshiftfunctionkey to bind Shift-F5
gitk | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
1.7.12.1.382.gb0576a6
The function includes a workaround for systems where F* keys are mapped
to XF86_Switch_VT_* when modifiers are used.
Signed-off-by: Andrew Wong
---
gitk | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gitk b/gitk
index 379582a..f8f89a5 100755
--- a/gitk
+++ b/gitk
Signed-off-by: Andrew Wong
---
gitk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitk b/gitk
index f8f89a5..d53fdb2 100755
--- a/gitk
+++ b/gitk
@@ -2501,7 +2501,7 @@ proc makewindow {} {
bindkey ? {dofind -1 1}
bindkey f nextfile
bind . updatecommits
path along with a rev argument, but I
don't have time to look it right now. I'll try to get to that issue another
time.
Andrew Wong (2):
git-gui: Detect full path when parsing arguments
git-gui: Don't prepend the prefix if value looks like a full path
git-gui.sh | 20
additional branch that
checks the file name without using the prefix.
Signed-off-by: Andrew Wong
---
git-gui.sh | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/git-gui.sh b/git-gui.sh
index 5d035d5..5d7894b 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3003,10 +3003,1
When argument parsing fails to detect a file name, "git-gui" will try to
use the previously detected "head" as the file name. We should avoid
prepending the prefix if "head" looks like a full path.
Signed-off-by: Andrew Wong
---
git-gui.sh | 9 +++--
1 fi
On 10/03/2012 03:47 PM, Alexander Kostikov wrote:
Expected behaviour:
- restore branch to pre-rebase location on out of memory exception
- not to fall with out of memory in the first place. But for our
repository that could be fixed only after either:
--- a) msysgit would have x64 binary (current
On 10/03/2012 06:35 PM, Alexander Kostikov wrote:
That allows you can go back to the pre-rebase state by
"rebase --abort".
rebase --abort command were not available. I guess rebase file was not created.
I meant "rebase --abort" would be available *if* the error was caught by
"rebase". But in yo
On 10/04/2012 12:35 AM, John Whitney wrote:
I just ran into a problem that I'm pretty sure is a bug in git. Just
read and run this (fairly trivial) shell script to replicate.
I tried your steps on a Mac, but I wasn't able to produce the issue.
Perhaps I don't have the right CRLF configs to trigg
On 10/04/2012 12:16 PM, John Whitney wrote:
This problem occurs on Mac, Windows, and Linux, and
with multiple versions of git. Note that in my script a CR
is appended to test.txt. On the Mac, you can generate this
in Terminal by pressing Ctrl-V Ctrl-M. Or, alternatively,
just download and run the
On 10/04/2012 05:09 PM, Alexander Kostikov wrote:
Full script is uploaded to
https://dl.dropbox.com/u/10828740/rebase.log Here is the last page:
Judging from that log, I'm pretty sure "rebase" is failing at
"format-patch". I was able to reproduce the issue you're having:
"rebase" finished and
On 10/04/2012 05:20 PM, Marco Craveiro wrote:
Similar but not quite; the idea is that you know that there is some
code (I'm just talking about files here, so lets ignore hunks for the
moment) which is normally checked in but for a period of time you want
it ignored. So you don't want it git ignor
an intermediate file to store the output of 'format-patch'.
But the intermediate file could get very big, so it didn't seem like a good
idea.
Andrew Wong (1):
rebase: Handle cases where format-patch fails
git-rebase--am.sh | 37 +++--
1 file changed
and in the pipeline is
available, we rely on || to detect whether 'format-patch' has failed.
Also print messages to help user with how to recover from such failures.
Signed-off-by: Andrew Wong
---
git-rebase--am.sh | 37 +++--
1 file changed, 35 insert
1-git-svn-props/svnrepo' contains unsupported hostname at \
> /home/jrn/src/git-scratch/perl/blib/lib/Git/SVN.pm line 148
>
> With it, the git-svn tests pass again.
>
> Signed-off-by: Jonathan Nieder
Thanks for noticing this.
Signed-off-by: Eric Wong
and pushed to my master at g
Could we look into getting this patch into git/gitk?
On 10/02/12 11:04, Andrew Wong wrote:
> Refactored the code for binding modified function keys as Junio suggested.
>
> Andrew Wong (2):
> gitk: Refactor code for binding modified function keys
> gitk: Use bindshiftfunctionke
Could we look into getting these two patches into git/git-gui?
On 10/02/12 12:25, Andrew Wong wrote:
> I ran into a file name parsing issue in git-gui. If I'm in a subfolder and try
> to pass a full path to "git-gui blame", then "git-gui" will fail to detect the
On 10/07/12 20:39, Thiago Farina wrote:
> When trying to build from source but it's failing:
>
> $ sudo make prefix=/usr/local all
> LINK git-credential-store
> gcc: @CHARSET_LIB@: No such file or directory
> make: *** [git-credential-store] Error 1
Did you run the "configure" script?
In the so
, or
in repos with larger files and perhaps binary files.
Andrew Wong (1):
rebase: Handle cases where format-patch fails
git-rebase--am.sh | 28 +---
1 file changed, 25 insertions(+), 3 deletions(-)
--
1.8.0.rc0.19.ga19ab82.dirty
--
To unsubscribe from this list
27;format-patch' and 'am' by using an
intermediate file. This gurantees that we can invoke 'am' with the
complete input, or not invoking 'am' at all if 'format-patch' failed.
Also print messages to help user with how to recover from such failur
On 10/08/12 17:36, Thiago Farina wrote:
> OK, after running ./configure I tried the make command again.
>
> CC credential-store.o
> /bin/sh: clang: not found
> make: *** [credential-store.o] Error 127
>
> $ which clang
> /home/tfarina/chromium/src/third_party/llvm-build/Release+Asserts/bin/clang
>
n, which is approximately equivalent
to removal followed by adding a new file and works fine. Follow suit.
Noticed using t9100. After this change, git-svn's file-to-symlink
changes are sent in a format that modern "svn update" can handle and
tests t9100.11-13 pass again.
[ew
Jonathan Nieder wrote:
> Michael J Gruber wrote:
> > Jonathan Nieder venit, vidit, dixit 09.10.2012 10:41:
>
> >> Signed-off-by: Jonathan Nieder
> >
> > Tested with Subversion 1.6.18.
Thanks both. Also pushed to "master" on git://bogomips.org/git-svn.git
(commit 44bc5ac71fd99f195bf1a3bea63c111
Jonathan Nieder wrote:
> Eric Wong wrote:
>
> > Thanks both. Also pushed to "master" on git://bogomips.org/git-svn.git
> > (commit 44bc5ac71fd99f195bf1a3bea63c11139d2d535f)
> >
> > Jonathan Nieder (2):
> > git svn: work around SVN 1.7 mishand
Jonathan Nieder wrote:
> Eric Wong wrote:
> > Jonathan Nieder wrote:
>
> >> -- >8 --
> >> Subject: Git::SVN::Editor::T: pass $deletions to ->A and ->D
> >
> > For future reference, it'd be slightly easier for me to apply if you
> >
e
'write_basic_state' and 'move_to_original_branch' to make the logic flow a bit
better and easier to read.
Andrew Wong (1):
rebase: Handle cases where format-patch fails
git-rebase--am.sh | 51 +--
1 file changed, 45 insertions(+)
rrange
the 'write_basic_state' and 'move_to_original_branch' to make the logic
flow a bit better and easier to read.
Signed-off-by: Andrew Wong
---
git-rebase--am.sh | 51 +--
1 file changed, 45 insertions(+), 6 deletions(-)
On 10/11/12 16:54, Thiago Farina wrote:
> Just setting CC to gcc works for me. But still, I'd like to be able to
> build with clang (may be as you noted is just something with the + in
> my PATH).
Oh, I just realized you were using "sudo". The PATH environment was
probably not inherited when you us
Can I get some feedback on these two patches? It'd be great to have them
merged into git-gui. Thanks.
On 10/02/2012 12:25 PM, Andrew Wong wrote:
I ran into a file name parsing issue in git-gui. If I'm in a subfolder and try
to pass a full path to "git-gui blame", then &q
Can I get some feedback on these two patches? It'd be great to have them
merged into gitk. Thanks.
On 10/02/2012 11:04 AM, Andrew Wong wrote:
Refactored the code for binding modified function keys as Junio suggested.
Andrew Wong (2):
gitk: Refactor code for binding modified function
On 10/15/2012 11:53 AM, Uri Moszkowicz wrote:
I'm trying to convert a CVS repository to Git using cvs2git. I was able to
generate the dump file without problem but am unable to get Git to
fast-import it. The dump file is 328GB and I ran git fast-import on a
machine with 512GB of RAM.
Just taking
On 10/15/2012 05:28 PM, Uri Moszkowicz wrote:
Thanks for the reply. Yes I am using a 64-bit build of Git. The report
is too large to attach to email so I've uploaded it here (~6MB tar.xz
file):
http://www.tempfiles.net/download/201210/267447/fast_import_crash18192.html
Hm, there are some blanks
On Tue, Oct 16, 2012 at 3:41 PM, Uri Moszkowicz wrote:
> I can do that if it still fails tomorrow. How do I build a debug version of
> git?
>
> On Tue, Oct 16, 2012 at 2:35 PM, Andrew Wong wrote:
>> Yea, it's a difficult problem to diagnose. It'd be really helpf
Jonathan Nieder wrote:
> Until Subversion 1.7 (more precisely r873487), the standard way to
> canonicalize a URI was to call svn_path_canonicalize(). Use it.
>
> This saves "git svn" from having to rely on our imperfect
> reimplementation of the same. If the function doesn't exist or
> returns
I may have
only had 256M in my dev machine at the time I added this parameter:
commit 6af1db447b10c03db4c04a55000efaa9aad38caa
Author: Eric Wong
Date: Wed Feb 14 16:04:10 2007 -0800
git-svn: allow --log-window-size to be specified, default to 100
The newer default value should should lower memory u
Jeff King wrote:
> On Fri, Oct 26, 2012 at 09:46:02AM +, Eric Wong wrote:
> > Overly large values also lead to excessive memory usage. I may have
> > only had 256M in my dev machine at the time I added this parameter:
>
> That's probably worth mentioning. Gunnl
Jeff King wrote:
> Since it was such a small topic, I just went ahead and queued bc22b27 in
> my repo. If that's not OK, I can revert it from 'next' and wait to get
> it by pulling from you.
That's fine, thanks!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a me
Junio C Hamano wrote:
> Marcin Owsiany writes:
>
> >> This makes my idea to do the same to "my something else instead of
> >> master" much less attractive. In fact I don't think such behaviour would
> >> be useful.
> >>
> >> I think with the suggested patch git-svn works as I would like it to:
Michael G Schwern wrote:
Hi Michael, thanks for taking your time to help with this.
I agree with everything Jonathan said (and thank him for taking
the time to point you in the right direction).
I too (very strongly) prefer email for code review. I doubt I would've
ever gotten involved if git
Marcin Owsiany wrote:
> On Wed, Jul 11, 2012 at 03:56:43PM -0700, Junio C Hamano wrote:
> > If the caller does not handle errors, it could be even clearer to
> > write it like
> >
> > command_noisy(qw(update-ref HEAD), $gs->refname) ||
> > die "Cannot update HEAD!!!";
>
> Turns o
Marcin Owsiany wrote:
> On Wed, Jul 18, 2012 at 11:27:22AM +, Eric Wong wrote:
> > Marcin Owsiany wrote:
> > > Turns out that command_noisy()
> > > - has a meaningless return value
> > > - throws an exception on command failure
> > > so the
Michael G Schwern wrote:
> On 2012.7.17 10:49 PM, Junio C Hamano wrote:
> > By allowing people to easily publish a completed work, and making it
> > easier for them to let others peek at their work, Git hosting
> > services like GitHub are wonderful. But I am not conviced that
> > quality code re
"Michael G. Schwern" wrote:
> From: "Michael G. Schwern"
>
> Put them in a new module called Git::SVN::Utils. Yeah, not terribly
> original and it will be a dumping ground. But its better than having
> them in the main git-svn program. At least they can be documented
> and tested.
>
> * fata
Michael G Schwern wrote:
> On 2012.7.25 2:24 PM, Eric Wong wrote:
> > Didn't we agree to use done_testing()? Perhaps (as you suggested) with
> > a private copy of Test::More? It's probably easier to start using
> > done_testing() earlier rather than later.
>
Junio C Hamano wrote:
> Michael G Schwern writes:
> > So... is that master or maint? Just let me know which one.
>
> I do not care too deeply either way, and in the end I think Eric
> should have the final say.
>
> Given that git://git.bogomips.org/git-svn.git/ has 'master' but
> nothing to bu
Michael G Schwern wrote:
> On 2012.7.24 7:55 PM, Eric Wong wrote:
> > Except git is also a "new specialized tool". Your examples are exactly
> > why I'm saddened many projects only adopted git, but not the workflow
> > which _built_ git (and Linux).
>
&
12.7.25 4:08 PM, Eric Wong wrote:
> >>>> +BEGIN {
> >>>> +# Override exit at BEGIN time before Git::SVN::Utils is loaded
> >>>> +# so it will see our local exit later.
> >>>> +*CORE::GLOBAL::exi
Michael G Schwern wrote:
> On 2012.7.25 4:48 PM, Eric Wong wrote:
> > We need to use something. Right now our choice of mailer is the best
> > choice for _existing_ contributors.
>
> I believe this entire discussion can be reduced to that right there.
>
> If yo
ms for the test suite:
commit d25c26e771fdf771f264dc85be348719886d354f
Author: Eric Wong
Date: Fri Nov 24 22:38:18 2006 -0800
git-svn: exit with status 1 for test failures
Some versions of the SVN libraries cause die() to exit with 255,
and 40cf043389ef4cdf3e56e7c4268d6f302e387fa0 tightened up
test_expect_f
Michael G Schwern wrote:
> On 2012.7.26 10:18 PM, Junio C Hamano wrote:
> > Again, I agree with you that passing $prefix as one of the arguments
> > to ->new is the right thing to do in the final state after applying
> > the whole series. I don't know if later steps in your patch series
> > will
Junio C Hamano wrote:
> The result will be queued tentatively near the tip of 'pu', but as
> this is primarily about git-svn, I would prefer a copy that is
> vetted by Eric to be fed from him.
OK. I've signed-off on the 7 patches you have in pu. Will look at the
other series in a few hours.
Th
perl/perl.mak.
[ew: commit message]
ref: http://mid.gmane.org/7vlii51xz4@alter.siamese.dyndns.org
Signed-off-by: Eric Wong
---
Makefile | 7 +++
perl/Makefile | 1 +
2 files changed, 8 insertions(+)
diff --git a/Makefile b/Makefile
index b0b3493..e2a4ac7 100644
--- a/Makefile
+++ b/Makefile
@@ -209
Michael G Schwern wrote:
> On 2012.7.27 1:07 PM, Eric Wong wrote:
> > While Makefile.PL now finds .pm files on its own, it does not
> > detect new files after it generates perl/perl.mak.
>
> Are you saying this doesn't work?
>
> perl Makefile.PL
> make -f
Junio C Hamano wrote:
> Eric Wong writes:
>
> > I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
>
> OK, it seems that you haven't pushed out the result yet (which is
> fine); how do we want to proceed?
Oops, got sidetracked into something
Eric Wong wrote:
> Junio C Hamano wrote:
> > Eric Wong writes:
> >
> > > I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
> >
> > OK, it seems that you haven't pushed out the result yet (which is
> > fine); how do we w
Junio C Hamano wrote:
> Eric Wong writes:
> > The redundant dependencies are biting us :< I agree there presence in
> > the top-level Makefile needs to be reviewed.
>
> Do you feel confident enough that we can leave that question hanging
> around and still merge this
Junio C Hamano wrote:
> Ok, please don't forget to add necessary .gitignore rule for the new
> stamp file.
I noticed/remembered that, but I forgot to mention I squashed that in,
too :)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.ker
"Michael G. Schwern" wrote:
> This series of patches extracts the remaining classes from git-svn. They're
> all simple extractions and functionally have no change.
I've also pushed this to the "extract-remaining" series which
also includes everything that's currently in my master.
I squashed Mi
"Michael G. Schwern" wrote:
We try to keep Subject: lines short (~50 char soft limit) as documented
in SubmittingPatches.
How about:
Subject: [PATCH 4/5] use Git::SVN->path accessor globally
Subject: [PATCH 5/5] use Git::SVN{,::RA}->url accessor globally
?
I can make the changes to the commit
Junio C Hamano wrote:
> Eric Wong writes:
>
> > "Michael G. Schwern" wrote:
> >> This series of patches extracts the remaining classes from git-svn.
> >> They're
> >> all simple extractions and functionally have no change.
> >
>
"Michael G. Schwern" wrote:
> From: "Michael G. Schwern"
>
> The SVN API functions will not accept ../foo but their canonicalization
> functions will not collapse it. So we'll have to do it ourselves.
>
> _collapse_dotdot() works better than the existing regex did.
I don't dispute it's better
Michael G Schwern wrote:
> On 2012.7.28 6:55 AM, Jonathan Nieder wrote:
> > Michael G. Schwern wrote:
> >> --- a/perl/Git/SVN/Utils.pm
> >> +++ b/perl/Git/SVN/Utils.pm
> >> @@ -86,6 +86,27 @@ sub _collapse_dotdot {
> >>
> >>
> >> sub canonicalize_path {
> >> + my $path = shift;
> >> +
> >> +
"Michael G. Schwern" wrote:
> There is one exception. t9100-git-svn-basic.sh fails 11-13. This appears
> to be due to a bug in SVN to do with symlinks. Leave that for somebody
> else, this is the final submission in the series.
That's fine, a few failing tests is better than completely failing
Michael G Schwern wrote:
> On 2012.7.30 1:38 PM, Eric Wong wrote:
> > Anyways, I don't like relying on operator overloading, it makes code
> > harder to read and review.
>
> Right now, canonicalization is a bug generator. Paths and URLs have to be in
> the same form
Michael G Schwern wrote:
> On 2012.7.30 3:15 PM, Eric Wong wrote:
> >> Right now, canonicalization is a bug generator. Paths and URLs have to be
> >> in
> >> the same form when they're compared. This requires meticulous care on the
> >> part of the
Michael G Schwern wrote:
> It just doesn't matter.
>
> Why are we arguing over which solution will be 4% better two years from now,
> or if my commits are formatted perfectly, when tremendous amounts of basic
> work to be done improving git-svn? The code is undocumented, lacking unit
> tests, di
Michael G Schwern wrote:
> That's the part that doesn't matter. People matter.
> What I'm trying to say is I have much less interest in doing it without the
> overloading. It's not interesting to me. It's no fun. No fun means no
> patch. No patch means no improvement. No improvement is the
Robert Luberda wrote:
> While importing changes from SVN by `git svn fetch' strip any
> white spaces from beginnings and endings of SVN commit messages
> and skip adding a new line character before `git-svn-id:'
> line in case the commit message ends with another pseudo-header
> (like From:, Signe
Robert Luberda wrote:
> Eric Wong wrote:
> > How about making this optional and configurable at init/clone time?
>
> I don't think it will be hard to make it configurable. I can try to make
> such a change, do you have any preferences about the option and
> co
"Michael G. Schwern" wrote:
> This patch series fixes git-svn for SVN 1.7 tested against SVN 1.7.5 and
> 1.6.18. Patch 7/8 is where SVN 1.7 starts passing.
Thanks Michael. I've made minor editorial changes (mostly rewording
commit titles to fit the larger project).
Junio:
The following change
Robert Luberda wrote:
> dcommit didn't handle errors returned by SVN and coped very
> poorly with concurrent commits that appear in SVN repository
> while dcommit was running. In both cases it left git repository
> in inconsistent state: index (which was reset with `git reset
> --mixed' after a su
Jonathan Nieder wrote:
> Thanks from me as well. I'm still worried about whether the increased
> use of canonicalize_url will introduce regressions for the existing
> SVN 1.6 support, and I should have time to look it over this weekend.
>
> The comment in canonicalize_url "There wasn't a 1.6 way
801 - 900 of 955 matches
Mail list logo
