When merging 2 branches with the same modifications on the both sides,
depending the merge side, one branch disappear from the file history.
To be more clear, there is a script in attachment to reproduce, but
here is the result :
$ git log --graph --oneline --all --decorate --name-status
*
Hi Dmitry,
On Thu, Oct 30, 2014 at 6:41 PM, Dmitry Oksenchuk oksenchu...@gmail.com wrote:
2014-10-30 19:54 GMT+03:00 Christian Couder christian.cou...@gmail.com:
This might be a good idea. Did you already test that the small
repository is really faster than the full repository?
Yes, because
This avoids the following failure with normal get_dir on newer
versions of SVN (tested with SVN 1.8.8-1ubuntu3.1):
Incorrect parameters given: Could not convert '%ld' into a number
get_dir2 also has the potential to be more efficient by requesting
less data.
ref:
This avoids the following failure with normal get_dir on newer
versions of SVN (tested with SVN 1.8.8-1ubuntu3.1):
Incorrect parameters given: Could not convert '%ld' into a number
get_dir2 also has the potential to be more efficient by requesting
less data.
ref:
Eric Wong normalper...@yhbt.net wrote:
Hi Junio, I haven't heard back from Hin-Tak about the last one
(git-svn: coerce check_path and get_log args to int)[1],
but I think it's a harmless defensive patch in case you
want to tag 2.2-rc0 soon.
OK, that coercion patch was pointless and I worked
While using diff-highlight with other tools, I have discovered that Python
ignores SIGPIPE by default. Unfortunately, this also means that tools
attempting to launch a pager under Python--and don't realize this is
happening--means that the subprocess inherits this setting. In this case, it
means
I have had multiple attempts from IP address 54.229.173.106 (an address that
brings up a link to your web page) to place calls to some of my video CODEC's.
I suspect there is some new virus infecting web sites as I have recently seen
multiple IP address from around the world associated with
For a old bug autoupdate don't do it before autoconf v2.66
Signed-off-by: Elia Pinto gitter.spi...@gmail.com
---
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 6af9647..9f01999 100644
--- a/configure.ac
+++ b/configure.ac
@@
Hi Christian,
On Thu, Oct 30, 2014 at 6:41 PM, Dmitry Oksenchuk oksenchu...@gmail.com
wrote:
2014-10-30 19:54 GMT+03:00 Christian Couder christian.cou...@gmail.com:
This might be a good idea. Did you already test that the small
repository is really faster than the full repository?
Yes,
Eric Wong normalper...@yhbt.net wrote:
This avoids the following failure with normal get_dir on newer
versions of SVN (tested with SVN 1.8.8-1ubuntu3.1):
Incorrect parameters given: Could not convert '%ld' into a number
Filed a bug in Debian since I hit it in sid, too:
After searching around a bit I couldn't find a stand-alone Git hook
that would intelligently block binary data pushes so I wrote my own:
https://github.com/avar/pre-receive-reject-binaries
Main features:
* Quota per-commit for how much binary data is OK
* Ability to optionally allow users to
line-log tries to access all parents of a commit, but only the first
parent has been loaded if --first-parent is specified, resulting
in a crash.
Limit the number of parents to one if --first-parent is specified.
Reported-by: Eric N. Vander Weele eri...@gmail.com
Signed-off-by: Tzvetan Mikov
Elia Pinto gitter.spi...@gmail.com writes:
For a old bug autoupdate don't do it before autoconf v2.66
I am having a hard time parsing this.
What is the practical issue that comes from the lack of quoting
here? It won't be like somebody defines a macro to allow 2.59 to
expand to something
Dear Sir/Madam, Here is a pdf attachment of my proposal to you. Please
read and reply I would be grateful. Jose Calvache
--
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
An early preview release Git v2.2.0-rc0 is now available for
testing at the usual places. Please give it a test.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the 'v2.2.0-rc0'
tag and the 'master' branch
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The tip of 'master' was tagged as v2.2.0-rc0; hopefully we can have
a good 2.2 final sometime in the middle of next month.
You can find the
--
On Fri, Oct 31, 2014 19:08 GMT Eric Wong wrote:
Eric Wong normalper...@yhbt.net wrote:
This avoids the following failure with normal get_dir on newer
versions of SVN (tested with SVN 1.8.8-1ubuntu3.1):
Incorrect parameters given: Could not convert '%ld'
Hin-Tak Leung ht...@users.sourceforge.net wrote:
On Fri, Oct 31, 2014 19:08 GMT Eric Wong wrote:
Filed a bug in Debian since I hit it in sid, too:
http://bugs.debian.org/767530
Thanks all.
Hmm, but why are you filing at debian? I had the error when i applied
the dev code patches on top
Philip Oakley philipoak...@iee.org writes:
As a side project (slow time) I've been looking at the loss of the
HEAD symbolic ref when multiple heads are bundled that point at the
same rev. That is, when the HEAD detection heuristic fails.
It think you are talking about the logic used by the
-
On Fri, Oct 31, 2014 10:34 GMT Eric Wong wrote:
This avoids the following failure with normal get_dir on newer
versions of SVN (tested with SVN 1.8.8-1ubuntu3.1):
Incorrect parameters given: Could not convert '%ld' into a number
get_dir2 also has the potential to be
Hin-Tak Leung ht...@users.sourceforge.net wrote:
Tested-by: Hin-Tak Leung ht...@users.sourceforge.net
Okay, this one on top of my git 2.1.0 + 10 recent git svn improvement
patches
allow me to fetch further.
I suspect the problem must be elsewhere though, and this just band-aided
over
Hi,
Since Git v2.2.0-rc0 had already been released, it's time to start new round
of git l10n. This time there are 62 new messages need to be translated since
last update for v2.1.0:
l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)
Generate po/git.pot from v2.2.0-rc0 for git v2.2.0
On Sat, 1/11/14, Eric Wong normalper...@yhbt.net wrote:
Hin-Tak Leung ht...@users.sourceforge.net
wrote:
Tested-by: Hin-Tak Leung ht...@users.sourceforge.net
Okay, this one on
top of my git 2.1.0 + 10 recent git svn improvement
patches
Hin-Tak Leung ht...@users.sourceforge.net wrote:
While my 2.10 + 11 patches continue to fetch, where it was stuck, now
it does Couldn't find revmap... - also, the single branch clone is doing
the 'trunk/branches/... thing - are these supposed to happen?
I'm afraid this is a problem with the
On Fri, Oct 31, 2014 at 02:48:17PM -0700, Junio C Hamano wrote:
Programs that read a pack data stream unpack-objects were originally
designed to ignore cruft after the pack data stream ends, and
because the bundle file format ends with pack data stream, you
should have been able to append
On Fri, Oct 31, 2014 at 07:04:04AM -0400, John Szakmeister wrote:
While using diff-highlight with other tools, I have discovered that Python
ignores SIGPIPE by default. Unfortunately, this also means that tools
attempting to launch a pager under Python--and don't realize this is
On Fri, Oct 31, 2014 at 01:59:20PM -0700, Junio C Hamano wrote:
--
[Discarded]
* jk/tag-contains (2014-06-30) 8 commits
. perf: add tests for tag --contains
. tag: use commit_contains
. commit: provide a fast multi-tip contains function
27 matches
Mail list logo
