Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion constraints.sql
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ alter table change add constraint change_who_user_valid

-- the 'integed' table is denormalised, with rows normally appearing
-- in pairs. However, these rows were missing their partners:
select
select
i1.change,
i1.subject || '#' || i1.subject_minrev || ',' || i1.subject_maxrev,
int_type.title,
Expand Down
42 changes: 21 additions & 21 deletions git-p4raw
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ SQL
();
}
elsif ( m{^journal.(\d+).gz} and
($max_checkpoint && $max_checkpoint > $1
($max_checkpoint && $max_checkpoint > $1
or $max_journal && $max_journal >= $1
or $top_checkpoint && $top_checkpoint > $1)
and !$load_opts{all_interesting}
Expand Down Expand Up @@ -1997,7 +1997,7 @@ sub make_cc { # only CC's eez tasting like theez
obj_change => shift,
obj_headrev => shift };


}

sub diff_right {
Expand Down Expand Up @@ -4148,7 +4148,7 @@ SQL
$commit=$1;
@parents=split" ",$2 if $2;
}
elsif ( my ($depotpath, $change) =
elsif ( my ($depotpath, $change) =
m{^\s*p4raw-id:\s*(\S*)@(\d+)} ) {
mutter "adding $depotpath\@$change (".substr($commit, 0, 12).")";
$DB::single = 1;
Expand Down Expand Up @@ -4409,26 +4409,26 @@ An example interactive session:

maia:~/src/p4-rsync$ git-p4raw describe 17
Change 17 by mbeattie@localhost on 1997/05/25 06:46:49

Wholesale update to 5.004.

On path //depot/relperl,
add 291 file(s)
delete 27 file(s)
edit 392 file(s)

Parent: //depot/relperl@16
maia:~/src/p4-rsync$ git-p4raw graft 17 16 perl-5.004
maia:~/src/p4-rsync$ git-p4raw describe 17
Change 17 by mbeattie@localhost on 1997/05/25 06:46:49

Wholesale update to 5.004.

On path //depot/relperl,
add 291 file(s)
delete 27 file(s)
edit 392 file(s)

Parent: //depot/relperl@16 (manual)
Parent: perl-5.004
maia:~/src/p4-rsync$ git-p4raw export-commits -v 2..17
Expand Down Expand Up @@ -4801,34 +4801,34 @@ inserting some rows manually.

maia:~/src/p4-rsync$ git-p4raw describe 3736
Change 3736 by jhi@alpha on 1999/07/26 01:10:03

Populate metaconfig branch.

git-p4raw: warning: ignoring changes on path //depot/metaconfig/U/ebcdic@3736
git-p4raw: warning: ignoring changes on path //depot/metaconfig/U/a_dvisory@3736
git-p4raw: warning: ignoring changes on path //depot/metaconfig/U/acl@3736
git-p4raw: warning: ignoring changes on path //depot/metaconfig/U/compline@3736
On path //depot/metaconfig/U,
add 353 file(s)

On path //depot/metaconfig/U.check,
add 7 file(s)

On path //depot/metaconfig/dist-3.0at70,
add 576 file(s)

On path //depot/metaconfig/dist-3.0at70b,
add 633 file(s)

maia:~/src/p4-rsync$ psql
Welcome to psql 8.2.4, the PostgreSQL interactive terminal.

Type: \copyright for distribution terms
\h for help with SQL commands
\? for help with psql commands
\g or terminate with semicolon to execute query
\q to quit

pumpkin=# delete from change_parents
where parent_branchpath like '//depot/metaconfig/%';
DELETE 690 0
Expand All @@ -4843,13 +4843,13 @@ inserting some rows manually.
pumpkin=# \q
maia:~/src/p4-rsync$ git-p4raw describe 3736 -w
Change 3736 by jhi@alpha on 1999/07/26 01:10:03

Populate metaconfig branch.

On path //depot/metaconfig,
add 1569 file(s)
maia:~/src/p4-rsync$

maia:~/src/p4-rsync$

=head2 Replacing Perforce changes with previously crafted ones

Expand Down
4 changes: 2 additions & 2 deletions tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ create table int_type (
title text,
description text
);

-- some integration types which I have yet to fully decypher; however,
-- I considered their variation relatively disinteresting historically
-- as it is derivable. So, these are for display and possible use as
Expand Down Expand Up @@ -170,7 +170,7 @@ create table label (
tagname TEXT not null,
depotpath TEXT not null,
primary key (tagname, depotpath),
revision int NOT NULL
revision int NOT NULL
) inherits (source_file);

-- this table holds the marks that we send to git fast-import
Expand Down