[PATCH 2 of 2 v2] commit: add option to amend the working dir parent
Matt Mackall
mpm at selenic.com
Thu Apr 12 20:22:03 CDT 2012
On Fri, 2012-04-06 at 16:38 +0300, Idan Kamara wrote:
> On Fri, Apr 6, 2012 at 4:33 PM, Idan Kamara <idankk86 at gmail.com> wrote:
>
> > # HG changeset patch
> > # User Idan Kamara <idankk86 at gmail.com>
> > # Date 1333719162 -10800
> > # Node ID 33bcbc0ebae51eeb9814d78fb90ed006d2cbf800
> > # Parent bf459db44b58587a296d47c4e24868d79501d01e
> > commit: add option to amend the working dir parent
>
>
> This series fixes some of the remarks given in the previous one
> and smooths a few edges.
This is failing roughly one of ten test runs with variations of this:
$ hg ci --amend -m 'b -> d'
saved backup bundle to
$TESTTMP/.hg/strip-backup/9c207120aa98-amend-backup.hg
$ hg st --rev .^ --copies d
- A d
- b
+ abort: data/c.i at d9ca53c718ad: no match found!
+ [255]
$ hg cp d e
$ hg ci -m 'e = d'
$ hg cp e f
$ hg ci --amend -m 'f = d'
- saved backup bundle to
$TESTTMP/.hg/strip-backup/fda2b3b27b22-amend-backup.hg
+ saved backup bundle to
$TESTTMP/.hg/strip-backup/97604149292b-amend-backup.hg
$ hg st --rev .^ --copies f
A f
d
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel
mailing list