[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: haskell-lens

[Replying to the list as it might be of general interest]


Am Dienstag, den 15.04.2014, 00:04 +0100 schrieb Colin Watson:
> 22:45 <nomeata> cjwatson: Hi. I believe your forgot to tag your haskell-lens upload, or to push the tag
> 22:58 -!- nomeata [nobody@nomeata.de] has quit [Quit: Client exiting]
> Fair point.  So I just tried:
>   <cjwatson@amber ~/src/debian/pkg-haskell/haskell-lens/haskell-lens-3.10>$ darcs push -av --repodir=debian
>   Pushing to "darcs.debian.org:/darcs/pkg-haskell/haskell-lens"...
>   We have the following patches to push:
>   Mon Apr  7 18:21:54 BST 2014  Colin Watson <cjwatson@debian.org>
>     tagged 3.10-2
>   Mon Apr  7 18:21:54 BST 2014  Colin Watson <cjwatson@debian.org>
>     * releasing package haskell-lens version 3.10-2
>   The remote repository has 1 patch to pull.
>   darcs failed:  Refusing to apply patches leading to conflicts.
>   If you would rather apply the patch and mark the conflicts,
>   use the --mark-conflicts or --allow-conflicts options to apply
>   These can set as defaults by adding
>    apply mark-conflicts
>   to _darcs/prefs/defaults in the target repo.
>   Backing up ./changelog(.~0~)
>   There are conflicts in the following files:
>   ./changelog
>   Apply failed!
> Suggestions?  Does this mean you've taken care of it?

no, it seems someone else (Raúl) has now done his changes on top of what
was the repository, so his patch conflicts with your
"releasing package haskell-lens version 3.10-2"

So what you should do is to run "darcs pull". This will make a mess out
of debian/changelog. Then make sure it contains your "haskell-lens
(3.10-2)" entry as uploaded, and above the entry that Raúl would have
added if you had released; probably

haskell-lens (4.1.2-1) UNRELEASED; urgency=medium

  * New upstream release
  * Bump standards version, no change
  * Adapt patches to the new release

 -- Raúl Benencia <rul@kalgan.cc>  Mon, 14 Apr 2014 14:19:38 -0300

Then record the change (this resolves the conflict) and push.


Joachim "nomeata" Breitner
Debian Developer
  nomeata@debian.org | ICQ# 74513189 | GPG-Keyid: F0FBF51F
  JID: nomeata@joachim-breitner.de | http://people.debian.org/~nomeata

Attachment: signature.asc
Description: This is a digitally signed message part

Reply to: