Differences between revisions 1 and 2
Revision 1 as of 2006-07-17 10:01:58
Size: 1870
Comment: first version with rough outlines
Revision 2 as of 2006-07-26 09:03:15
Size: 3581
Comment: added tailor config file
Deletions are marked like this. Additions are marked like this.
Line 21: Line 21:

This is important: if you are using tailor *do not* create an initial repository.
Line 22: Line 25:

The best way is to use a local copy of the upstream repository. In our example we're going to use the clisp package. Sourceforge makes the CVS repositories available via rsync, so we create a copy with:

{{{mkdir ~/tmp/clisp-cvs ; rsync://clisp.cvs.sourceforge.net/cvsroot/clisp/ ~/tmp/clisp-cvs/}}}

Then we create a simple tailor configfile:

{{{cat <<EOF > tailorconfigfile
[DEFAULT]
verbose = True

[clisp]
target = darcs:clisp
start-revision = clisp_2_33_84-2005-07-07
root-directory = ~/packaging/repository/clisp-upstream
state-file = tailor.state
source = cvs:clisp
subdir = .

[darcs:clisp]
repository = ~/packaging/repository/clisp-upstream
encoding = UTF8

[cvs:clisp]
repository = ~/tmp/clisp-cvs
module = clisp
encoding = ISO-8859-1
EOF
}}}

In this case we want to start syncing the upstream cvs not from the beginning of time, but from the 2.33.84 release, because tailor barfs on some older cvs records. Please note also the convertion of character encoding, but is important for clisp because some of the source is in 8 bit latin-1 german. Then we start the import with {{{HCRTS="-M640M -K64M" LC_ALL=C LANG=C tailor --configfile=tailor-configfile clisp}}} and go to sleep.

In the morning you'll have a nice darcs repository of the clisp upstream archive.

Open issues:

 * we should be able to only update until a certain revision, but this does not work
 * sometimes tailor produces broken darcs repositories, you need to check the repository
Line 23: Line 65:

After you have a upstream repository create a new debian one with {{{darcs get --repo-name=clisp clisp-upstream}}}.
Line 28: Line 73:
The most important tip for using darcs is that sometimes the build-in conflict management fails. So  The most important tip for using darcs is that sometimes the build-in conflict management fails. So

Packaging Debian Packages using Darcs and Tailor

This page is intended to collect howto and tips related to Debian packaging using darcs and tailor.

What

[http://www.darcs.net/ darcs] is a revision control system that does not need a central repository or network connectivity. Also branching is pretty cheap in time and space requirements.

[http://progetti.arstecnica.it/tailor tailor] is a utility to convert between revision control systems. We use it to convert the upstream format to darcs format.

How

We will have 2 repositories for package foo: foo and foo-upstream. The work will be done in another repository in order to minimize rollbacks and accidental repository corruption. So you have a ~/packaging/repository/foo, ~/packaging/repository/foo-upstream, ~/packaging/work/foo and ~/packaging/work/foo-upstream structure for example.

You do your merging of upstream, preparing of packages etc in ~/packaging/work and only do darcs push if you want to record the changes. For team cooperation I would then rsync the ~/packaging/repository tree to some webserver.

Starting the repository

This is important: if you are using tailor *do not* create an initial repository.

Converting upstream with tailor

The best way is to use a local copy of the upstream repository. In our example we're going to use the clisp package. Sourceforge makes the CVS repositories available via rsync, so we create a copy with:

mkdir ~/tmp/clisp-cvs ; rsync://clisp.cvs.sourceforge.net/cvsroot/clisp/ ~/tmp/clisp-cvs/

Then we create a simple tailor configfile:

{{{cat <<EOF > tailorconfigfile [DEFAULT] verbose = True

[clisp] target = darcs:clisp start-revision = clisp_2_33_84-2005-07-07 root-directory = ~/packaging/repository/clisp-upstream state-file = tailor.state source = cvs:clisp subdir = .

[darcs:clisp] repository = ~/packaging/repository/clisp-upstream encoding = UTF8

[cvs:clisp] repository = ~/tmp/clisp-cvs module = clisp encoding = ISO-8859-1 EOF }}}

In this case we want to start syncing the upstream cvs not from the beginning of time, but from the 2.33.84 release, because tailor barfs on some older cvs records. Please note also the convertion of character encoding, but is important for clisp because some of the source is in 8 bit latin-1 german. Then we start the import with HCRTS="-M640M -K64M" LC_ALL=C LANG=C tailor --configfile=tailor-configfile clisp and go to sleep.

In the morning you'll have a nice darcs repository of the clisp upstream archive.

Open issues:

  • we should be able to only update until a certain revision, but this does not work
  • sometimes tailor produces broken darcs repositories, you need to check the repository

Making the first debian package

After you have a upstream repository create a new debian one with darcs get --repo-name=clisp clisp-upstream.

Keeping up to date

Team operations

Tip and tricks

The most important tip for using darcs is that sometimes the build-in conflict management fails. So

  • if a darcs command fails, retry it with more memory using GHCRTS="-M640M -K64M" darcs ...

  • if the conflict is too complex, use an external merge command: GHCRTS="-M640M -K64M" darcs apply --interactive --verbose --external-merge 'kdiff3 --output %o %a %1 %2' foo.dpatch

  • do a darcs check to check your repository now and again

  • likewise do darcs optimize now and again.