[PATCH 1 of 2 V2 STABLE] unshelve: don't commit unknown files during unshelve (issue4113)

Thomas Arendsen Hein thomas at intevation.de
Wed Nov 27 02:51:24 CST 2013


* Durham Goode <durham at fb.com> [20131127 01:43]:
> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1385511785 28800
> #      Tue Nov 26 16:23:05 2013 -0800
> # Branch stable
> # Node ID 8b6d3738dee65def3b8c6db2fa0970bf4f31dc18
> # Parent  2ca325ea57fa13909e28cc2caeae3c73e60693f8
> unshelve: don't commit unknown files during unshelve (issue4113)

As mentioned in the tracker:
This patch fixes (at least) my test case for this issue and
the critical issue4112, too.

But if an unknown file should be changed by the unshelve, I get:

remote changed foo which local deleted
use (c)hanged version or leave (d)eleted?

When I select (c), the file gets overwritten with the shelved
version, but no .orig file is created!

When I select (d), the unknown file is kept, but the shelved version
is lost!

Expected behaviour: No prompt, the unknown file should be moved to
.orig and the shelved file should be checked out.

Regards,
Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner


More information about the Mercurial-devel mailing list