Mercurial > hg

view tests/test-rebase-mq-skip.out @ 8821:c66e324d3961

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test-convert-cvsnt-mergepoints so it works reliably. Specifically, always run 'cvs commit' with -f option to force commit; add one strategic sleep which seems to be necessary for post-merge clobber-and-commit (-f doesn't force a commit there?).
author Greg Ward <greg-hg@gerg.ca>
date Mon, 15 Jun 2009 20:35:19 -0400
parents 808f03f61ebe
children 7b19cda0fa10
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
nothing changed
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: