Mercurial > hg
view tests/test-mq-qfold.out @ 10969:ca052b484e56
context: remove parents parameter to workingctx
it was needed before the refactor of commit, workingctx always uses the
dirstate now.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 21 Apr 2010 01:18:31 +0200 |
parents | 8cb81d75730c |
children |
line wrap: on
line source
% init adding a % fold in the middle of the queue popping p3 popping p2 now at: p1 --- a/a +++ b/a @@ -1,1 +1,2 @@ a +a p1 p3 --- a/a +++ b/a @@ -1,1 +1,3 @@ a +a +b % fold with local changes abort: local changes found, refresh first --- a/a +++ b/a @@ -1,1 +1,3 @@ a +a +b reverting a % fold git patch into a regular patch, expect git patch popping git now at: regular # HG changeset patch # Parent diff --git a/a b/a --- a/a +++ b/a @@ -1,3 +1,4 @@ a a b +a diff --git a/a b/aa copy from a copy to aa --- a/a +++ b/aa @@ -1,3 +1,4 @@ a a b +a popping regular now at: p1 % fold regular patch into a git patch, expect git patch popping regular now at: git # HG changeset patch # Parent diff --git a/a b/aa copy from a copy to aa --- a/a +++ b/aa @@ -1,3 +1,4 @@ a a b +b