comparison tests/test-merge9.out @ 7316:9737041646bc

bookmarks: Use dirstate to determine the current node in addchangegroup Using the changectx might result in a lookup error during the strip command. Thefore we use the current dirstate to get the parents of the working directory.
author David Soria Parra <dsp@php.net>
date Wed, 05 Nov 2008 03:53:34 +0100
parents 92ccccb55ba3
children 5a14a8f3b909
comparison
equal deleted inserted replaced
7312:82f80c16fc16 7316:9737041646bc