view tests/test-confused-revert.out @ 2108:30c7564f6dfc

Move empty local repo logic for pull into findincoming This fixes a silly attempt to pull a changegroup from an empty repo.
author Matt Mackall <mpm@selenic.com>
date Fri, 21 Apr 2006 15:33:51 -0500
parents 968f036f93a4
children b2ae81a7df29
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
undeleting a
forgetting b
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b