[darcs-users] darcs patch: Accept issue1401: bug in get_extra commuting patches.

Trent W. Buck trentbuck at gmail.com
Sun Mar 29 23:35:30 UTC 2009


On Sun, Mar 29, 2009 at 10:14:14AM +0200, Petr Rockai wrote:
> darcs pull       --repodir e/ -a d/
> Backing up ./f(-darcs-backup0)
> We have conflicts in the following files:
> ./f
> Finished pulling and applying.
> darcs obliterate --repodir e/ -ap 'Add f and g'
> 
> darcs failed:  Can't obliterate patch without reverting some unrecorded change.
> 
> This is almost certainly not what's intended.

I only get that for the legacy "hashed" and "old-fashioned-inventory"
types.  I believe the bug is not relevant to those repository formats,
but ICBW.

For "darcs-2" format, you should get

    darcs pull       --repodir e/ -a d/
    Finished pulling and applying.
    darcs obliterate --repodir e/ -ap 'Add f and g'
    Finished obliterating.
    darcs pull       --repodir e/ -a d/
    Pulling from "/home/twb/Desktop/Darcs/darcs+twb/bugs-darcs-2.dir/d"...
    darcs: bug in get_extra commuting patches:
    First patch is:
    Mon Mar 30 10:30:52 EST 2009  tester
      * Add f
    Second patch is:
    Mon Mar 30 10:30:53 EST 2009  tester
      * Change f

I don't know what the "right" way is to skip this script for the
legacy repo formats.


More information about the darcs-users mailing list