I've been getting a couple of test failures and finally had the time to track
them down.
t4034-diff-words fails tests "22 diff driver 'bibtex'" and "26 diff driver
'html'". Bisecting shows that the file started giving me errors in commit
8d96e72 "t4034: bulk verify builtin word regex sanity",
Comments from mentors and people interested in remote helpers?
I did minimum line wrapping, typofix and small compilation fixes
and queued these on 'pu'; I think I saw one commit whose message
I didn't quite get what it was trying to say, and another that was
missing S-o-b (I left them untouched).
On Fri, Aug 17, 2012 at 11:47:49AM -0400, George Spelvin wrote:
> Something like "git commit --fixup HEAD~3", where "git commit --fixup HEAD"
> would be equivalent to "git commit --amend".
Aside from the ways others mentioned on how to do this, I think that a
better interface if this were to be ad
On Fri, 2012-08-17 at 06:22 -0700, Greg KH wrote:
> On Fri, Aug 17, 2012 at 09:18:44AM +0200, Daniel Vetter wrote:
> > On Fri, Aug 17, 2012 at 1:18 AM, Greg KH wrote:
> > > On Tue, Aug 14, 2012 at 01:50:11AM -0400, Gregs git-bot wrote:
> > >> commit: 5ab3633d6907018b0b830a720e877c3884d679c3
> > >>
Stephen Bash writes:
> What is the recommended method for resolving this sort of merge?
> kdiff3 obviously doesn't understand the situation. Do the working
> tree files contain all the conflicts? If so, I can just go
> through by hand and resolve the conflicts the old fashion way.
Yes. Extern
- Original Message -
> From: "Stephen Bash"
> Sent: Friday, August 17, 2012 9:48:45 AM
> Subject: "Temporary merge branch 2" Conflicts
>
> Given this branch history:
>
> -M--M---M---> dev
> \ / / /
> -- v1-maint
> \
Split the decision of what to do and actually doing it in
handle_node() to allow for detection of branches from svn nodes.
Split it into handle_node() and apply_node().
svn dumps are structured in revisions, which contain multiple nodes.
Nodes represent operations on data. Currently the function
h
As a preparation for handling branches in svndumps, make rev_ctx
and node_ctx more flexible.
Add the object to work on to the arguments of reset_*_ctx() and to
handle_node() to allow for multiple *_ctx objects.
Convert the static global node_ctx to a linked list ofsuch objects
to be able to accum
Search for a note attached to the ref to update and read it's
'Revision-number:'-line. Start import from the next svn revision.
If there is no next revision in the svn repo, svnrdump terminates
with a message on stderr an non-zero return value. This looks a
little weird, but there is no other way
To ease testing without depending on a reachable svn server, this
compact python script mimics parts of svnrdumps behaviour.
It requires the remote url to start with sim://.
Start and end revisions are evaluated.
If the requested revision doesn't exist, as it is the case with
incremental imports, i
To provide metadata from svn dumps for further processing, e.g.
branch detection, attach a note to each imported commit that
stores additional information.
The notes are currently hard-coded in refs/notes/svn/revs.
Currently the following lines from the svn dump are directly
accumulated in the note
For testing as well as for importing large, already
available dumps, it's useful to bypass svnrdump and
replay the svndump from a file directly.
Add support for file:// urls in the remote url.
e.g. svn::file:///path/to/dump
When the remote helper finds an url starting with
file:// it tries to open
The reference to update by the fast-import stream is hard-coded.
When fetching from a remote the remote-helper shall update refs
in a private namespace, i.e. a private subdir of refs/.
This namespace is defined by the 'refspec' capability, that the
remote-helper advertises as a reply to the 'capabl
Signed-off-by: Florian Achleitner
---
Documentation/git-remote-helpers.txt | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-remote-helpers.txt
b/Documentation/git-remote-helpers.txt
index f5836e4..5faa48e 100644
--- a/Documentation/git
The existing function only allows reading from a filename or
from stdin. Allow passing of a FD and an additional FD for
the back report pipe. This allows us to retrieve the name of
the pipe in the caller.
Signed-off-by: Florian Achleitner
---
vcs-svn/svndump.c | 22 ++
vcs-
Enable basic fetching from subversion repositories. When processing
remote URLs starting with svn::, git invokes this remote-helper.
It starts svnrdump to extract revisions from the subversion repository
in the 'dump file format', and converts them to a git-fast-import stream
using the functions of
Hi!
Thanks for the reviews!
This series contains the follwing improvements.
I decided to summarize them here, sorted by topic instead of
attaching them to the patches.
all:
- remove all merge garbage and debugging legacy (hopefully).
- reviews: style
- reorder patches
remote-svn:
- review: refa
From: "Junio C Hamano"
Sent: Friday, August 17, 2012 8:48 PM
"Philip Oakley" writes:
diff --git a/Documentation/git.txt b/Documentation/git.txt
index ca85d1d..75b35ce 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -22,11 +22,13 @@ unusually rich command set that provides bo
"Philip Oakley" writes:
> diff --git a/Documentation/git.txt b/Documentation/git.txt
> index ca85d1d..75b35ce 100644
> --- a/Documentation/git.txt
> +++ b/Documentation/git.txt
> @@ -22,11 +22,13 @@ unusually rich command set that provides both high-level
> operations
> and full access to inter
From: "Junio C Hamano"
Sent: Friday, August 17, 2012 7:19 AM
"Philip Oakley" writes:
From: "Junio C Hamano"
Sent: Thursday, August 16, 2012 9:23 PM
"Philip Oakley" writes:
I wasn't aware of the "abbreviated options" capability. Is meant
to
be in the man pages as I couldn't find it, or
Thomas Rast writes:
> Umm, have you looked at the algorithm I proposed?
> ...
> So really, this is only about modifying the algorithm that generates the
> existing order to allow for streaming output as it reads through
> history.
Sorry, I thought you were optimizing sort_in_topological_order()
On Fri, Aug 17, 2012 at 12:44 PM, Jens Lehmann wrote:
>
> I'm almost there. The only thing left is to check if a nested
> submodule is using a git directory. In that case I expect "rm" to
> fail even when -f is used to protect the submodule's history. I
> still need to find a suitable command for
Phil Hord writes:
> On Thu, Aug 16, 2012 at 6:00 PM, Junio C Hamano wrote:
>> Phil Hord writes:
>>
>>> So, the next roll will remove the tests for MERGE_RR and will be more
>>> explicit about the potential for mergetool confusion and/or the fact
>>> that it is not explicitly tested here.
>>>
>>
Phil Hord writes:
> Add a failing test to confirm a conflicted stash apply
> invokes rerere to record the conflicts and resolve the
> the files it can.
>
> mergetool may be confused by a left-over
> state from previous rerere activity causing it to
> think no files have conflicts even though they
On Thu, Aug 16, 2012 at 6:00 PM, Junio C Hamano wrote:
> Phil Hord writes:
>
>> So, the next roll will remove the tests for MERGE_RR and will be more
>> explicit about the potential for mergetool confusion and/or the fact
>> that it is not explicitly tested here.
>>
>> I'll wait a little longer f
Luke Diamand writes:
> All I need is to be able to get the commit *immediately* after the
> failed 'git rebase'. It looks like .git/ORIG_HEAD has exactly what I
> need.
Depends on what you meant by "commit that was skipped", but the
above makes me nervous. ORIG_HEAD is set to the tip of the bra
Thomas Rast writes:
> I hope I got that right. The order of commits is still entirely
> determined by the choice of "any tentative source", but the algorithm
> should now stream nicely once the generation numbers are known.
Thanks for an intereseting read.
Even though generation numbers are no
On Fri, Aug 17, 2012 at 12:40 PM, Jens Lehmann wrote:
> Am 17.08.2012 17:28, schrieb Daniel Milde:
>> Hi all,
>> I have encountered some difficulties with the new location of the
>> metainformation directory (GIT_DIR) of submodules.
>>
>> The change of location happened in 1.7.8:
>>
>> * When pop
Junio C Hamano writes:
> Thomas Rast writes:
>
>> However, suppose we knew generation numbers. I haven't actually looked
>> into the old threads again, but my understanding was that they are
>> numbers g(C) attached to each commit C such that
>>
>> g(C) = 1 + max(g(P) for P a parent of C) f
Robin Rosenberg writes:
> Remove extraneous parentheses and braces
> Remove redundant NUL-termination
> Check result of unlink when probing for decomposed file names
>
> Signed-off-by: Robin Rosenberg
> ---
Thanks. I've found and fixed a bit more style violations while we
are at it.
--
To unsu
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Erik Faye-Lund writes:
> As far as I'm concerned, I consider this complete from my point of
> view. Should I send out a new version with the fixup squashed in?
I've already queued them as one commit. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a mess
Thomas Rast writes:
> However, suppose we knew generation numbers. I haven't actually looked
> into the old threads again, but my understanding was that they are
> numbers g(C) attached to each commit C such that
>
> g(C) = 1 + max(g(P) for P a parent of C) for non-root commits
>
> g(C) =
> Have you tried "git rebase --autosquash"? It does part of what you are
> asking for and additionally allows multiple fixup commits to be queued
> up and processed in a single rebase.
No, I hadn't! It's not *quite* as simple as what I had hoped for, but
definitely is progress in that directio
Am 16.08.2012 23:56, schrieb Junio C Hamano:
> Jens Lehmann writes:
>
>> Am 09.07.2012 21:38, schrieb Junio C Hamano:
>>> Jens Lehmann writes:
>>>
Cool, so let's drop this patch and I'll teach "rm" to handle
populated submodules according to what we do for regular files:
Make sure
On 08/17/2012 05:47 PM, George Spelvin wrote:
With git's "commit frequently" style, I often find that I end up with a
commit that includes a typo in a comment or I forgot one call site when
updating functions or something.
And it's a few commits later before I notice the simple oops.
This is of
Am 17.08.2012 17:28, schrieb Daniel Milde:
> Hi all,
> I have encountered some difficulties with the new location of the
> metainformation directory (GIT_DIR) of submodules.
>
> The change of location happened in 1.7.8:
>
> * When populating a new submodule directory with "git submodule init",
>
"George Spelvin" writes:
> With git's "commit frequently" style, I often find that I end up with a
> commit that includes a typo in a comment or I forgot one call site when
> updating functions or something.
[...]
> But it would be really handy if there were a one-step command for doing this.
>
>
Using git version 1.7.12.rc2.18.g61b472e
(1.7.9 has the same problem)
If I run (directly in the bare repository)
git filter-branch -d ../localrewrite --parent-filter cat
I get this error message on the last line, nothing unusual before:
error: Untracked working tree file 'AUTHORS' would be overw
With git's "commit frequently" style, I often find that I end up with a
commit that includes a typo in a comment or I forgot one call site when
updating functions or something.
And it's a few commits later before I notice the simple oops.
This is of course fixable by making a commit, rebase -i HE
Hi all,
I have encountered some difficulties with the new location of the
metainformation directory (GIT_DIR) of submodules.
The change of location happened in 1.7.8:
* When populating a new submodule directory with "git submodule init",
the $GIT_DIR metainformation directory for submodules i
Remove extraneous parentheses and braces
Remove redundant NUL-termination
Check result of unlink when probing for decomposed file names
Signed-off-by: Robin Rosenberg
---
compat/precompose_utf8.c | 11 ---
1 fil ändrad, 4 tillägg(+), 7 borttagningar(-)
diff --git a/compat/precompose_utf
Junio C Hamano [mailto:gits...@pobox.com] writes:
>> I have read that this restriction was made for some kind of security
>> reason, and one possibility would be to add a config option on the
>> server repo to turn off this safety check. As we manage the git repos
>> ourselves, this would be perfe
Hi all-
Given this branch history:
-M--M---M---> dev
\ / / /
-- v1-maint
\ \ \
M---M---> v1.5-maint
I am attempting to merge v1.5-maint into dev. There are some expected
conflicts, but when I start
l...@diamand.org wrote on Fri, 17 Aug 2012 07:04 +0100:
> On 17/08/12 00:35, Pete Wyckoff wrote:
> >These patches rework how git p4 deals with conflicts that
> >arise during a "git p4 submit". These may arise due to
> >changes that happened in p4 since the last "git p4 sync".
> >
> >Luke: I especi
l...@diamand.org wrote on Fri, 17 Aug 2012 08:21 +0100:
> On 17/08/12 00:35, Pete Wyckoff wrote:
> >If a commit fails to apply cleanly to the p4 tree, an interactive
> >prompt asks what to do next. In all cases (skip, apply, write),
> >the behavior after the prompt had a few problems.
> >
> >Chang
On Fri, Aug 17, 2012 at 5:34 AM, Junio C Hamano wrote:
> Erik Faye-Lund writes:
>
>> On Fri, Jul 27, 2012 at 7:10 PM, Erik Faye-Lund wrote:
>>> Since the Windows port of Git expects binary pipes, we need to make
>>> sure the helper-end also sets up binary pipes.
>>>
>>> Side-step CRLF-issue in t
j.s...@viscovery.net wrote on Fri, 17 Aug 2012 08:53 +0200:
> Am 8/17/2012 1:35, schrieb Pete Wyckoff:
> > +++ b/t/t9815-git-p4-submit-fail.sh
> > @@ -0,0 +1,93 @@
> > +
> > +#!/bin/sh
>
> This initial blank line is an accident, right? ;-)
Yes, the paint on the font was still wet. Thanks!
Thomas Rast writes:
> Junio C Hamano writes:
>
> The topo order algorithm can be modified to take advantage of
> [generation numbers], in order to provide incremental processing:
>
> Let S be the set of tentative sources
>
> Let U be the set of vertices whose out-edges are no known yet
>
Junio C Hamano writes:
> Thomas Rast writes:
>
>> The right fix would be to dig up Peff's work on generation number
>> caching, and modify the algorithm to take generation numbers into
>> account.
>
> I think you are totally wrong here, unless you are talking about a
> generation number that is
On 16/08/12 16:43, Junio C Hamano wrote:
Luke Diamand writes:
If I do "git rebase --skip", is there a way to find out the commit SHA
that was skipped (other than just parsing the output of the command) ?
There currently isn't, and I do not think it is doable in general
when the command ever
Thanks, for the great answer.
What I am still concerned about is that in my project I plan to make bigger
structural changes (let's say in 1.2) while still developing in the
older branch
(let's say 1.1 with the old structure. I expect that there will be many changes
which I think that they can't b
Miklos Vajna writes:
> On Thu, Aug 16, 2012 at 11:18:40PM -0700, Junio C Hamano
> wrote:
>> From: Miklos Vajna
>> Date: Thu, 16 Aug 2012 11:50:18 +0200
>> Subject: [PATCH] man: git pull -r is a short for --rebase
>>
>> Letting the "--rebase" option squat on the short-and-sweet single
>> lette
On 17/08/12 00:35, Pete Wyckoff wrote:
If a commit fails to apply cleanly to the p4 tree, an interactive
prompt asks what to do next. In all cases (skip, apply, write),
the behavior after the prompt had a few problems.
Change it so that it does not claim erroneously that all commits
were applie
Manfred Rudigier writes:
> we have recently upgraded our Ubuntu server to 12.04, which comes
> with a newer version of GIT. However, we have noticed that git
> archive -remote does not work anymore by specifying the SHA sum of
> a commit.
> ...
> I have read that this restriction was made for som
On Thu, Aug 16, 2012 at 11:18:40PM -0700, Junio C Hamano
wrote:
> From: Miklos Vajna
> Date: Thu, 16 Aug 2012 11:50:18 +0200
> Subject: [PATCH] man: git pull -r is a short for --rebase
>
> Letting the "--rebase" option squat on the short-and-sweet single
> letter option "-r" was an unintended a
56 matches
Mail list logo
