I am using Darcs to maintain Debian packages.

My general mode of operation is this:

* I have two repos for each Debian package.  In the upstream
  repo, I simply track new tarballs when they're released.  (Using
  darcs_load_dirs to help with renames)

* The Debian repo contains my Debian-specific patches.  These add
  the debian/ directory, and also may modify code.

* When a new upstream version comes out, it is recorded into the
  upstream repo, tagged, and then the upstream repo is pulled (merged)
  into the Debian repo.

Lately I have been finding that this last step, the merge, is causing
troubles.  Sometimes the near-infinite wait for the merge to complete.

But yesterday, I discovered a new one.  The wait for the merge only (!)
took about 3 hours, and then I was able to resolve merge conflicts,
record the resolution.  But anybody else that tries to pull that repo
(or my poor server, when I tried to push the change) still experiences a
huge slowdown, despite the presence of the conflict-resolution patch.

Is there any other workflow I could adopt that would let me avoid this
problem entirely, while still letting me share both of my repos
publically?  (If your suggestion relies on unrecord when a new upstream
comes out, I am *NOT* interested)

-- John



_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users

Reply via email to