61 Commits
Author SHA1 Message Date
Rainer MüllerandRainer Müller 538daf9e1a fix-branches-base: rename branches to release-X.Y 2016-11-10 11:50:48 +01:00
Rainer MüllerandClemens Lang ac6fa00270 fix-tags-base: keep old cvs2svn tags
Otherwise the git-svn-id links do not point to the correct object.
2016-11-05 00:31:31 +01:00
Rainer MüllerandClemens Lang b5ebdd076e fix-tags-base: lots of bug fixes, special cases 2016-11-05 00:31:31 +01:00
Rainer MüllerandClemens Lang 2e134bf370 fix-tags-base: exclude release_1_2_0-archive-rc1 2016-11-05 00:31:31 +01:00
Rainer MüllerandClemens Lang e7a9dc4eb2 fix-tags-base: heredoc syntax indent needs tabs 2016-11-05 00:31:31 +01:00
Rainer MüllerandClemens Lang 1b7977be80 fix-tags-base: use log messages, when appropriate 2016-11-05 00:31:31 +01:00
Rainer MüllerandClemens Lang 4183617319 fix-tags-base: script to rename tags to vX.Y.Z 2016-11-05 00:31:31 +01:00
Clemens Lang 24d259fc17 convert-to-git.sh: Fix post w/ changed repo names
Since we changed the names of the exported repositories, fix the
post-processing code accordingly.
2016-10-29 18:16:42 +02:00
Ryan SchmidtandClemens Lang ddc6f1331a Note changeset where test was deleted 2016-10-29 01:08:13 +02:00
Ryan SchmidtandClemens Lang 792b9febd5 Fix typos in comments 2016-10-29 01:08:13 +02:00
Ryan SchmidtandClemens Lang 16efddc7be Rename repositories 2016-10-26 20:24:38 +02:00
Rainer MüllerandClemens Lang d0b3bf5d7d Remove rules for resources on release branches 2016-10-24 19:13:41 +02:00
Clemens Lang 304eac4627 Revert "Move resources from base to ports"
This reverts commit de7478f43f.

We've noticed that attempting to move the resources directory to the
ports repository creates ugly artifacts because that would be the only
content of the base release branches in the ports repo.
2016-10-19 14:00:51 +02:00
Clemens Lang 165cc987ed Silence warnings for release_1_4 r23202
We don't export this revision, but that generates a warning unless it is
explicitly marked as not exported.
2016-10-15 03:06:27 +02:00
Clemens Lang 2c9d8349f2 Silence a warning for larryv-subversion-subports
Ignore the rename operation from subversion-subport to
larryv-subversion-subports, since that would generate a backup copy of
the old branch.

Since we know that the branches are the same, we can just ignore the
copy.
2016-10-15 03:06:17 +02:00
Clemens Lang bdbcdcb5de release_1_4: Fix off-by-one for revision limits
Inluding r23202 would lead to a base folder in the branch, which we do
not want.
2016-10-15 02:40:39 +02:00
Clemens Lang 4dac720586 svn2git: update to include case-sensitivity fix 2016-10-15 02:13:56 +02:00
Clemens Lang ad864457e4 Clean up tags
release_1_4_0-rc1 and release_1_4_0-rc2 did not contain a base folder
because the release_1_4 branch was a copy of trunk/base, not a copy of
trunk with only the base folder.

Fix this by hiding the difference.

Additionally, drop the gimp_1_3_15 tag, which is not needed.
2016-10-15 02:12:01 +02:00
Clemens Lang cc4534629b Drop unused branches, fix some branch corner cases
Branches that did no longer exist would previously cause warnings during
the export. This adds explicit rules to ignore those to silence the
warnings.

While reviewing the warnings, I found a number of other branches that
required special handling:

- gsoc14-pip2port was moved to contrib later, let's move its history
  there as well.
- subversion-subports was later renamed to larryv-subversion-subports.
  Let's hide this rename and treat the branch as if its name had always
  been the latter.
- release_1_4 did not contain a single base subfolder like all the other
  release branches for a while, but was a complete copy of base. Let's
  hide this by converting it back into a copy of base.
2016-10-15 02:11:31 +02:00
Clemens Lang 7c90616d5e Remove unused recursion rule
Statistics showed that this rule was not used, so we might as well
remove it.
2016-10-15 02:05:59 +02:00
Clemens Lang e2a2211ea6 Remove a number of accidentially committed files
Some files in trunk shouldn't have been committed there. Let's just
ignore them for the export.
2016-10-15 02:05:17 +02:00
Clemens Lang 473f59738f convert-to-git.sh: Fix building with set -e
Not having svn-all-fast-export or qmake in $PATH would previously simply
abort the script due to set -e.
2016-10-15 02:04:09 +02:00
Clemens Lang 5fde67426c Remove stale branches for www and guide
Replace some branches for www and guide with empty rules. This avoids
generating warnings during the conversion.

Closes: #6
2016-10-15 02:03:19 +02:00
Ryan SchmidtandClemens Lang c58e2ec97a Add portgroups-selector and vcs-fetch branches 2016-10-13 11:29:11 +02:00
Clemens Lang 69b3499b84 gitconversion.rules: Handle /branches/release1
We only had a rule for /branches/release_[^/]+, but not for the first
release, which used a different naming scheme.

While at it, fix the naming scheme and rename the branch to release_1_0
to match the other release branches.
2016-10-11 22:24:01 +02:00