[PATCH 3 of 3] update: don't overwrite untracked ignored files on update
Martin von Zweigbergk
martinvonz at google.com
Tue Dec 2 19:56:44 CST 2014
On Tue Dec 02 2014 at 5:42:58 PM Martin von Zweigbergk <
martinvonz at google.com> wrote:
> diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t
> --- a/tests/test-up-local-change.t
> +++ b/tests/test-up-local-change.t
> @@ -196,9 +196,9 @@
> $ echo untracked > ignored
> $ hg st
> $ hg up 'desc("add ignored file")'
> - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> - $ cat ignored
> - ignored
> + ignored: untracked file differs
> + abort: untracked files in working directory differ from files in
> requested revision
> + [255]
>
This test case is no longer broken, so please remove the "BROKEN:" line in
flight if you don't mind.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20141203/0d130492/attachment.html>
More information about the Mercurial-devel
mailing list