[pkg-php-pear] pkg-php-tools conversion
taffit at debian.org
Tue Jul 2 16:06:50 UTC 2013
-----BEGIN PGP SIGNED MESSAGE-----
Le 02/07/2013 11:48, Prach Pongpanich a écrit :
> On Tue, Jul 2, 2013 at 9:54 AM, David Prévot <david at tilapin.org> wrote:
>> Hi Prach,
>> Le 01/07/2013 22:25, Prach Pongpanich a écrit :
>>> - repeat my work
>> That should just be a “git rebase”.
> I've tried but i can't do that, please help me
[ Sharing the techniques I recently used to move SPIP to Git ]
You should be able to import the history from Subversion in a clean Git
repository (e.g. php-net-checkip_svn) following advices from the wiki
 and eventually from Internet for nitpicking details.
You should be able to import the package history with gbp
gbp-import-dscs in another clean Git repository (e.g. php-net-checkip_dscs).
With the one you are currently working on, you now get three repositories.
When they are all OK, just add the first two, e.g., in the initial one
(or add all three in a new clean one):
git remote add svn ../php-net-checkip_svn
git fetch svn
git remote add dscs ../php-net-checkip_dscs
git fetch dscs
And you now have many branches with all the content you want, you can
then play with “git rebase” to push stuff where they belong, and
eventually redo some tags in your local Git repository. “gitk --all &”
can be pretty handy to have a look at what you are doing in the mean time.
Once you’re happy with the result, just keep the needed branches, and
push them to a cleaned up public repository.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
-----END PGP SIGNATURE-----
More information about the pkg-php-pear