[issue2886] bug merging a repository with subrepos inside

[timeless]

The unknown rev is the + at the end which means the working directory
is dirty...

On 7/6/11, Jan Schulze <bugs at mercurial.selenic.com> wrote:
>
> New submission from Jan Schulze <jschulze at mais.de>:
>
> Hello,
>
> we have a bug where ist comes to mercurial subrepos within a mercurial
> repo.
>
> We have a super-repo called 'DataControl' which houses some mercurial
> subrepos as its only content.
>
> We have multiple heads gotten produced in the repository 'DataControl'
> which represent different states of the suprepos.
>
> Merging requires step-by-step merging giving concrete repository numbers.
> When I give such a number I get the feedback as provided in the screenshot
> (commandline snapshot) talking about an unknown revision.
>
> I'm quite sure the unknown revision is looked for in one of the mercurial
> subrepos.
>
> ----------
> files: bug_mercurial.jpg
> messages: 16720
> nosy: jschulze
> priority: bug
> status: unread
> title: bug merging a repository with subrepos inside
>
> ____________________________________________________
> Mercurial issue tracker <bugs at mercurial.selenic.com>
> <http://mercurial.selenic.com/bts/issue2886>
> ____________________________________________________

-- 
Sent from my mobile device