[PATCH] backout of d04ba50e104d: allow to qpop/push with a dirty working copy
faheem at email.unc.edu
Sat Jun 25 13:26:24 CDT 2011
On Fri, 24 Jun 2011 23:40:34 +0300, Idan Kamara <idankk86 at gmail.com> wrote:
> # HG changeset patch
> # User Idan Kamara <idankk86 at gmail.com>
> # Date 1308947142 -10800
> # Branch stable
> # Node ID e9ed3506f066fe5ca88db31fbdea76e0244a9d7f
> # Parent f5765353d4300a879ec44590ee658cd78736053c
> backout of d04ba50e104d: allow to qpop/push with a dirty working copy
> The new behavior was breaking existing tools that relied on a
> sequence such as this:
> 1) start with a dirty working copy
> 2) qimport some patch
> 3) try to qpush it
> 4) old behavior would fail at this point due to outstanding changes.
> (new behavior would only fail if the outstanding changes and the
> patches changes intersect)
> 5) innocent user qrefreshes, gets his local changes in the imported patch
> It's worth considering if we can move this behavior to -f in the future.
+1. Looks like a good good idea to move it to -f to me. This currently
just discards the local changes, right?
More information about the Mercurial-devel