Mercurial > hg

view tests/test-gendoc-de.t @ 35410:83014fa95435

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix for hgsubversion 5c25fe7fb1e broke something in the hgsubversion test path, causing it raise an abort (Abort: nothing to merge) during a perfectly good rebase. I tracked it down to this change. It's probably not hgsubversion related. I suspect that using the same `wctx` from before the initial update causes problems with the wctx's cached manifest property. I noticed we also sometimes stick random gunk on the wctx object in other places (like in `copies.py`) so it's probably best to reset it for now. The line I added before was actually useless since we don't pass wctx to the initial `merge.update`, so it defaults to `repo[None]`. So I just removed it. Differential Revision: https://phab.mercurial-scm.org/D1679
author Phil Cohen <phillco@fb.com>
date Tue, 12 Dec 2017 22:05:21 -0800
parents 7a1ad08b9ff5
children
line wrap: on
line source

#require docutils gettext

  $ $TESTDIR/check-gendoc de
  checking for parse errors
  Die Dateien werden dem Projektarchiv beim n\xc3\xa4chsten \xc3\x9cbernehmen (commit) hinzugef\xc3\xbcgt. Um dies vorher r\xc3\xbcckg\xc3\xa4ngig zu machen, siehe:hg:`forget`. (esc)
  warning: please have a space before :hg: