<feed xmlns='http://www.w3.org/2005/Atom'>
<title>svn2git, branch distro/mga</title>
<subtitle>KDE's svn2git Fast Subversion to Git conversion utility</subtitle>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/'/>
<entry>
<title>Remove comment about fast import process limit.</title>
<updated>2014-06-16T21:12:04+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-06-16T21:12:04+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=9d61054a8e5a07ee2f406acfb5994e20684f4ed4'/>
<id>9d61054a8e5a07ee2f406acfb5994e20684f4ed4</id>
<content type='text'>
This is actually already implemented and has a 100 process limit.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This is actually already implemented and has a 100 process limit.
</pre>
</div>
</content>
</entry>
<entry>
<title>main: Load repository logs from the directories found</title>
<updated>2014-06-16T20:55:45+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-06-16T20:55:45+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=537bb357f89cf534acb7a656abd6b32130bb5349'/>
<id>537bb357f89cf534acb7a656abd6b32130bb5349</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>main: Whitespace (comments)</title>
<updated>2014-06-16T20:53:20+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-06-16T20:53:20+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=a8f714b1d6a99b454ae674ac6f0e72d329456f7b'/>
<id>a8f714b1d6a99b454ae674ac6f0e72d329456f7b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add note about changelog</title>
<updated>2014-05-30T10:03:19+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-05-30T10:03:19+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=80712f51f1058382a15ce53622d5ce80d7182545'/>
<id>80712f51f1058382a15ce53622d5ce80d7182545</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add Mageia README and rules for conversion.</title>
<updated>2014-05-29T08:50:32+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-05-29T08:21:22+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=4f20bec7bde3f58a8ceed5922e2cd04bd014c471'/>
<id>4f20bec7bde3f58a8ceed5922e2cd04bd014c471</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Return after renaming a repo to prevent importing the empty commit.</title>
<updated>2014-05-29T08:13:22+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-05-29T08:13:22+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=a4d2c84dc99e876419ec222de12a4609d49b92c4'/>
<id>a4d2c84dc99e876419ec222de12a4609d49b92c4</id>
<content type='text'>
This should be fine provided the cp did not also change files...
If there was a way to find out if the change is a net null, that would be
useful here.

Also, as we only use tags for markrelease on master branch, we can ignore any cross
repo tag copies as they will just clober the data we have already.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This should be fine provided the cp did not also change files...
If there was a way to find out if the change is a net null, that would be
useful here.

Also, as we only use tags for markrelease on master branch, we can ignore any cross
repo tag copies as they will just clober the data we have already.
</pre>
</div>
</content>
</entry>
<entry>
<title>Support repository renaming.</title>
<updated>2014-05-28T23:47:39+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-05-28T23:47:39+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=f8ed2101da602b39e6b914382baa4fd6872b7ea9'/>
<id>f8ed2101da602b39e6b914382baa4fd6872b7ea9</id>
<content type='text'>
This allows us to svn mv the cauldron/PKG/current folder to a new name and
have this copied over to git.

It does not yet handle the case where subsequent commits to previous distros
for the old name are magically moved over to the new name for the repo
(which I think is the correct behaviour as noted on the sysadm mailing list)
so some kind of rename mapping will have to be kept (if I ever implement
resuming support, then this map will have to be dumped to a file and restored
again about restart)

Another problem is that the tags are apparently all squashed up due to the
svn mv commit, but this should be handled via a simple return... after dealing
with the repo rename (although some changes may get lost :( if this is not a
straight copy (i.e. svn cp + changes in the same txn)
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This allows us to svn mv the cauldron/PKG/current folder to a new name and
have this copied over to git.

It does not yet handle the case where subsequent commits to previous distros
for the old name are magically moved over to the new name for the repo
(which I think is the correct behaviour as noted on the sysadm mailing list)
so some kind of rename mapping will have to be kept (if I ever implement
resuming support, then this map will have to be dumped to a file and restored
again about restart)

Another problem is that the tags are apparently all squashed up due to the
svn mv commit, but this should be handled via a simple return... after dealing
with the repo rename (although some changes may get lost :( if this is not a
straight copy (i.e. svn cp + changes in the same txn)
</pre>
</div>
</content>
</entry>
<entry>
<title>Move the repo renaming to a method for convenience.</title>
<updated>2014-05-28T22:50:40+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-05-28T22:34:35+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=1dbf0a91195c6e8bd4404cc6b922ba35dd5e9b4e'/>
<id>1dbf0a91195c6e8bd4404cc6b922ba35dd5e9b4e</id>
<content type='text'>
This also renames log and marks files.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This also renames log and marks files.
</pre>
</div>
</content>
</entry>
<entry>
<title>Handle master branch deletion.</title>
<updated>2014-05-24T22:31:39+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-05-24T22:31:39+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=3b270cf149ee67bcf2dace4edec34c91abe13bc5'/>
<id>3b270cf149ee67bcf2dace4edec34c91abe13bc5</id>
<content type='text'>
If the master branch is deleted, this typically means we are obsoleting our
package.

Rather than 'deal' with the branch deletion, simply rename the repository
and then continue.

We will likely have to deal with a later resurrection and also deal with
package renames better too (e.g. one commit renames and resurrecting
a specific package that was subsequently brought back from the dead)
but this will be dealt with in a later commit.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
If the master branch is deleted, this typically means we are obsoleting our
package.

Rather than 'deal' with the branch deletion, simply rename the repository
and then continue.

We will likely have to deal with a later resurrection and also deal with
package renames better too (e.g. one commit renames and resurrecting
a specific package that was subsequently brought back from the dead)
but this will be dealt with in a later commit.
</pre>
</div>
</content>
</entry>
<entry>
<title>Copying files as merge points fails badly.</title>
<updated>2014-05-24T16:41:50+00:00</updated>
<author>
<name>Colin Guthrie</name>
<email>colin@mageia.org</email>
</author>
<published>2014-05-24T16:41:50+00:00</published>
<link rel='alternate' type='text/html' href='https://gitweb.mageia.org/software/infrastructure/svn2git/commit/?id=41fbc8cbd2e559f3d9590747bef7d37c426e3f65'/>
<id>41fbc8cbd2e559f3d9590747bef7d37c426e3f65</id>
<content type='text'>
In our case I svn cp'ed a file from mga3 updates to mga2. With this code in place, this
caused a merge of mga3 and mga2 which made the output of mga2 git log very misleading
(it had tags and commits from v195 of systemd even tho' we were only shipping v44 there).

I don't think we'll lose anything by simply not merging here.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
In our case I svn cp'ed a file from mga3 updates to mga2. With this code in place, this
caused a merge of mga3 and mga2 which made the output of mga2 git log very misleading
(it had tags and commits from v195 of systemd even tho' we were only shipping v44 there).

I don't think we'll lose anything by simply not merging here.
</pre>
</div>
</content>
</entry>
</feed>
