view tests/test-rebase-mq-skip.out @ 10908:816bac2f9452 stable

prepush: fix bug in warning message selection In certain situations you would be told "you should pull and merge" even when there is nothing to pull.
author Sune Foldager <cryo@cyanite.org>
date Wed, 14 Apr 2010 19:11:35 +0200
parents 7b19cda0fa10
children c7dbd6c4877a
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

% "Mainstream" import p1.patch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
applying p1.patch

% Rebase
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
rebase completed
@  3 P0 tags: p0.patch qtip tip qbase
|
o  2 P1 tags: qparent
|
o  1 R1 tags:
|
o  0 C1 tags: