view tests/test-context.py.out @ 17988:848345a8d6ad stable

rebase: fix pull --rev options clashing with --rebase (issue3619) Rebase also have a plain `--rev` option used to select the rebase set (as `--base` or `--source` would). But the content of the --rev option was intended for the remote repo and is irrelevant for the local rebase operation. We expect `hg pull --rebase` to stick with the default behavior here: hg rebase --base . --dest tip(branch(.)) The `rev` option is dropped from the option passed to rebase.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 29 Nov 2012 16:37:15 +0100
parents bd23d5f28bbb
children 232038a05fdb
line wrap: on
line source

workingfilectx.date = (1000, 0)
ASCII   : Gr?ezi!
Latin-1 : Grüezi!
UTF-8   : Grüezi!