| 112824344501_588560007417 | Junio C Hamano |
|
On Fri, Jul 16, 2010 at 21:06, Jonathan Nieder <jrnieder@xxxxxxxxx wrote:
Ævar Arnfjörð Bjarmason wrote:
The failure is totally predicated on whether or not REG_STARTEND is
|
|
| |
| 194023664160_586360007108 | xC6var ArnfjxF6rxF0 |
|
Here are the topics that have been cooking. Commits prefixed with - are
only in pu while commits prefixed with + are in next. The ones
marked with . do not appear in any of the integration branches |
|
| |
| 103720354428_554660007259 | newren |
|
On Wed, Jul 07, 2010 at 04:51:47PM -0700, Junio C Hamano wrote:
* eb/double-convert-before-merge (2010-07-02) 3 commits
- Dont expand CRLFs when normalizing text during merge
- Try normalizi |
|
| |
| 149024754211_570760007593 | newren |
|
From: Elijah Newren <newren@xxxxxxxxx
Since fast-export operates by listing file changes since the (first) parent
commit, when using --import-marks and path limiting and using a wider list
of pa |
|
| |
| 132924964844_540060007514 | Sverre Rabbelier |
|
On Wed, Jul 7, 2010 at 2:46 PM, <newren@xxxxxxxxx wrote:
This patch series fixes silently dropped files in uses of fast-export
involving both --import-marks and limiting files by path. |
|
| |
| 145523224949_595660007673 | Michael J Gruber |
|
Hi
Is there a query command which I can run on my workspace which will
give output of following style. (in the same that of command
git merge foo givesO
I have examined git-lsfiles ; git log ; git |
|
| |
| 137321454039_553360007031 | BjxF6rn Steinbrink |
|
Hi,
I got a really weird result from a rebase today, and Im wondering if
thats a corner case or if that could be considered a bug in rebase.
This is reproducible with the following setup:
$ git clo |
|
| |
| 164120454066_506960007632 | Jakub Narebski |
|
On Wed, Jul 07, 2010 at 08:00:04PM +0200, Björn Steinbrink <B.Steinbrink@xxxxxx wrote:
On 2010.07.07 17:05:45 +0200, Mike Hommey wrote:
See how the security/manager/ssl/public/nsIBadCe |
|
| |
| 132920824106_554060007476 | Jeff King |
|
On Wed, Jul 07, 2010 at 02:44:50PM -0700, Jakub Narebski wrote:
Mike Hommey <mh@xxxxxxxxxxxx writes:
On Wed, Jul 07, 2010 at 08:00:04PM +0200, Björn Steinbrink <B.Steinbrink@xxxxxx |
|
| |
| 113221174973_597760007165 | Heiko Voigt |
|
Hi,
Johan and Junio thank you very much for the review. Here is a new
iteration with your comments incorporated.
Further below you can find the changes between the last iteration as
interdiff.
Hei |
|
| |
| 149129744487_543960007694 | Junio C Hamano |
|
This implements a simple merge strategy for submodule hashes. We check
whether one side of the merge candidates is already contained in the
other and then merge automatically.
If both sides contain |
|
| |
| 111223024839_515160007847 | Heiko Voigt |
|
On Wed, Jul 07, 2010 at 09:56:45AM -0700, Junio C Hamano wrote:
Heiko Voigt <hvoigt@xxxxxxxxxx writes:
diff --git a/submodule.c b/submodule.c
index 61cb6e2..9bc4b80 100644
--- a/ |
|
| |
| 118224764893_524960007485 | Bradley Wagner |
|
We will use this in a later patch to extend setup_revisions() to
load revisions directly from a submodule.
Signed-off-by: Heiko Voigt <hvoigt@xxxxxxxxxx
---
cache.h | 3 ++
path.c | 38 ++ |
|
| |
| 188128754567_598860007356 | Jacob Helwig |
|
I posted this question to StackOverflow and got back that I should use
the svn2git tool. Surely there has to be a native way to convert these
branches into local branches using git-svn.
rel="nofo |
|
| |
| 146425474474_543660007993 | Jacob Helwig |
|
In your example, does "remote2" represent the name of my remote Git
repo? What is "origin/branch-foo" and does the path
"refs/heads/branch-foo" need to actually exist in |
|
| |
| 160220144966_508960007896 | Jacob Helwig |
|
Thanks. Yea I was just looking at the man page trying to find the
notation with the colon separated ref names.
Is ":refs/heads/branch-foo" equivalent to just saying ":branch-foo" |
|
| |
| 178325664197_562160007032 | Jakub Narebski |
|
Hello,
I was happy with svn for a while, but recently I started a new branch
where I moved/renamed a few files, and merging became a less pleasant
experience: I have to manually generate diffs from |
|
| |
| 146829014509_536160007054 | Jakub Narebski |
|
On Wed, Jul 7, 2010 at 09:57, Jakub Narebski <jnareb@xxxxxxxxx wrote:
[...]
use strict;
use warnings;
+
+use File::Spec;
+# __DIR__ is taken from Dir::Self __DIR__ fragmen |
|
| |
| 184620304929_541360007343 | Jakub Narebski |
|
Jakub Narebski wrote:
On Wed, 7 Jul 2010, Ævar Arnfjörð Bjarmason napisał:
On Wed, Jul 7, 2010 at 09:57, Jakub Narebski <jnareb@xxxxxxxxx wrote:
[...]
|
|
| |
| 177024814890_524360007414 | Jakub Narebski |
|
On Tue, Jul 13, 2010 at 22:24, Jakub Narebski <jnareb@xxxxxxxxx wrote:
I wrote simple script that tests result of __DIR__ and $FindBin::Bin.
For cgi-bin / mod_cgi it was:
__DIR__ & |
|
| |
| 123625194429_520260007883 | Jakub Narebski |
|
On Wed, Jul 14, 2010 at 09:24, Jakub Narebski <jnareb@xxxxxxxxx wrote:
On Wed, 14 Jul 2010, Ævar Arnfjörð Bjarmason wrote:
On Tue, Jul 13, 2010 at 22:24, Jakub Narebski <jn |
|
| |
| 109723904448_529460007166 | Jakub Narebski |
|
Jakub Narebski <jnareb@xxxxxxxxx writes:
diff --git a/gitweb/Makefile b/gitweb/Makefile
index 2fb7c2d..84a1d71 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -145,12 +146,23 @@ |
|
| |
| 132724804066_583760007215 | Jakub Narebski |
|
Jakub Narebski <jnareb@xxxxxxxxx writes:
+install-modules:
+ install_dirs=$(sort $(dir $(GITWEB_MODULES))) &&
...
For example with the following Makefile:
GITWE |
|
| |
| 189126874245_582060007263 | Pierre Habouzit |
|
Prepare gitweb for having been split into modules that are to be
installed alongside gitweb in lib/ subdirectory, by adding
use lib __DIR__./lib;
to gitweb.perl (to main gitweb script), and prepa |
|
| |
| 116228704745_505260007662 | Stephen Rothwell |
|
Hi,
On Wed, Jul 07, 2010 at 11:48:58AM +1000, Stephen Rothwell wrote:
Hi Uwe,
On Tue, 6 Jul 2010 17:22:46 +0200 Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx wrote:
our -n |
|
| |
| 146723504181_589660007789 | newren |
|
This patch series fixes a number of spurious directory/file conflicts
and associated bugs appearing in cherry-pick, rebase, merge, and
fast-export. It also has a minor robustness improvement for
fas |
|
| |
| 177826494179_522660007191 | Elijah Newren |
|
newren@xxxxxxxxx writes:
From: Elijah Newren <newren@xxxxxxxxx
Signed-off-by: Elijah Newren <newren@xxxxxxxxx
---
t/t6035-merge-dir-to-symlink.sh | 37 ++++++++++++++++++++++++++ |
|
| |
| 139222704671_545860007512 | newren |
|
Elijah Newren <newren@xxxxxxxxx writes:
Id be happy to make these and the other changes you suggested, but I
notice that youve already done so in pu with Fixup commits for this
and the oth |
|
| |
| 167429984198_592060007299 | Elijah Newren |
|
newren@xxxxxxxxx writes:
From: Elijah Newren <newren@xxxxxxxxx
The D/F conflicts that can be automatically resolved (file or directory
unmodified on one side of history), have the nice p |
|
| |
| 118329804169_592860007282 | Junio C Hamano |
|
From: Alexander Gladysh <agladysh@xxxxxxxxx
This is a simple testcase where both sides of the rename are paths involved
in (separate) D/F merge conflicts
Signed-off-by: Alexander Gladysh <ag |
|
| |
| 158924994632_577060007184 | newren |
|
On Wed, Jul 7, 2010 at 3:26 PM, Junio C Hamano <gitster@xxxxxxxxx wrote:
diff --git a/t/t3508-cherry-pick-merge-df.sh b/t/t3508-cherry-pick-merge-df.sh
new file mode 100755
index 0000000 |
|
| |
| 155921724833_573960007776 | Elijah Newren |
|
newren@xxxxxxxxx writes:
From: Elijah Newren <newren@xxxxxxxxx
The fast-import stream format requires incremental changes which take place
immediately, meaning that for D- F conversions |
|
| |
| 193127914046_560160007153 | newren |
|
Elijah Newren <newren@xxxxxxxxx writes:
We correct the order by instructing the diff_tree machinery to compare
entries using df_name_compare instead of base_name_compare.
Doh! Yep, y |
|
| |
| 111329244150_531160007968 | Ramkumar Ramachandra |
|
From: Elijah Newren <newren@xxxxxxxxx
When older versions of fast-export came across a directory changing to a
symlink (or regular file), it would output the changes in the form
M 120000 :2398 |
|
| |
| 161120264948_578060007980 | Jonathan Nieder |
|
Add a basic SVN command-line client along with a Makefile that does
just enough to establish a connection with the ASF subversion server;
it initializes a memory pool, sees that configuration files a |
|
| |
| 106125434479_569460007874 | Jonathan Nieder |
|
Hi Jonathan,
Jonathan Nieder writes:
Ramkumar Ramachandra wrote:
Add a basic SVN command-line client along with a Makefile that does
just enough to establish a connection with the ASF s |
|
| |
| 187928724045_571160007444 | Daniel Shahaf |
|
Hi,
Jonathan Nieder writes:
Ramkumar Ramachandra wrote:
Heres a diff of the modifications I made after your review:
That’s quite helpful.
+++ b/svndumpr.c
@@ -76,31 + |
|
| |
| 148725414235_553360007485 | Jonathan Nieder |
|
Add the debug editor from subversion/libsvn_delta/debug_editor.c along
with a header to expose the svn_delta__get_debug_editor function.
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx
- |
|
| |
| 168722554408_583760007251 | Jonathan Nieder |
|
Add a dump editor and write out skeleton callback functions according
to the API documentation of svn_delta_editor_t. Also expose
get_dump_editor through a header.
Signed-off-by: Ramkumar Ramachandr |
|
| |
| 180521774278_575360007231 | Ramkumar Ramachandra |
|
Hi,
Jonathan Nieder writes:
Ramkumar Ramachandra wrote:
Add a dump editor and write out skeleton callback functions according
to the API documentation of svn_delta_editor_t. Also expose |
|
| |
| 173220194775_521160007087 | Ramkumar Ramachandra |
|
Ramkumar Ramachandra wrote:
Fill in replay_revstart to dump the revprops at the start of every
revision. Add an additional write_hash_to_stringbuf helper function.
A write_hash_to_stringbuf he |
|
| |
| 108425924960_512960007570 | Ramkumar Ramachandra |
|
On Thu, 2010-07-22, Ramkumar Ramachandra wrote:
Jonathan Nieder writes:
[...]
+ /* Output name length, then name. */
+ svn_stringbuf_appendcstr(*strbuf,
+ apr_psprintf(p |
|
| |
| 157427894111_580960007254 | Ramkumar Ramachandra |
|
open_root first creates a special edit_baton pool, and then allocates
memory from that pool to various items in edit_baton. Then it creates
a new directory baton to set as the root_baton. close_edit |
|
| |
| 129320084510_570260007077 | Ramkumar Ramachandra |
|
Implement add_file, open_file and change_file_prop. All of them
involve dumping the corresponding node information and setting up the
file_baton for apply_textdelta and close_file to use.
Signed-off |
|
| |
| 195426514255_523160007212 | Ramkumar Ramachandra |
|
Add a validation script along with a .gitignore. Using an existing
dump known to be correct (possibly generated using `svnsync` and
`svnadmin dump --deltas`), it compares the outputs produced by
`svn |
|
| |
| 146221354231_523660007945 | Ramkumar Ramachandra |
|
close_file measures the length of the temporary file to write text
headers and full text before cleaning up the temporary file. It also
writes props and prop deltas if necessary.
Signed-off-by: Ramk |
|
| |
| 132424304536_528360007839 | Ramkumar Ramachandra |
|
Ramkumar Ramachandra wrote:
+++ b/dump_editor.c
@@ -128,7 +128,7 @@ svn_error_t *get_dump_editor(const svn_delta_editor_t **editor,
de- close_directory = close_directory;
de- change_dir_ |
|
| |
| 185421334627_596660007950 | Ramkumar Ramachandra |
|
Ramkumar Ramachandra wrote:
Jonathan Nieder writes:
Ramkumar Ramachandra wrote:
- de- apply_textdelta = apply_textdelta;
+ /* de- apply_textdelta = apply_textdelta; */
[...]
Without t |
|
| |
| 121922364959_572960007804 | Ramkumar Ramachandra |
|
Implement open_directory, add_directory, change_dir_prop and
close_directory. All of them involve adding and removing entries from
the directory_baton and dumping the related node information. Note
t |
|
| |
| 180728914454_506160007858 | Junio C Hamano |
|
The last backslash in the commit message will make read read two lines
without -r, loosing the next commit, so use it.
Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx
---
git-rebase--intera |
|
| |
