Mercurial > hg

view tests/test-symlink-os-yes-fs-no.py.out @ 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 eb586ed5d8ce
children 5ac84b20f184
line wrap: on
line source

requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
new changesets d326ae2d01ee
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
new changesets d326ae2d01ee
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved