Mercurial > hg

view tests/test-mq-strip.out @ 11848:f54ff49393fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-abort-checkin
author Martin Geisler <mg@lazybytes.net>
date Sat, 14 Aug 2010 02:03:01 +0200
parents e2bce1c717fa
children
line wrap: on
line source

adding bar
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
changeset:   4:443431ffac4f
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     e

changeset:   3:65bd5f99a4a3
parent:      1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     d

changeset:   2:264128213d29
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

changeset:   1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

changeset:   0:9ab35a2d17cb
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 4, strip 4
changeset:   4:443431ffac4f
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     e

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to 
% after update 4, strip 4
changeset:   3:65bd5f99a4a3
tag:         tip
parent:      1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     d

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 4, strip 3
changeset:   4:443431ffac4f
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     e

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to 
% after update 4, strip 3
changeset:   1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 1, strip 4
changeset:   1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

saved backup bundle to 
% after update 1, strip 4
changeset:   1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 4, strip 2
changeset:   4:443431ffac4f
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     e

saved backup bundle to 
% after update 4, strip 2
changeset:   3:443431ffac4f
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     e

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% before update 4, strip 1
changeset:   4:264128213d29
tag:         tip
parent:      1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to 
% after update 4, strip 1
changeset:   0:9ab35a2d17cb
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% before update null, strip 4
saved backup bundle to 
% after update null, strip 4
changeset:   4:264128213d29
tag:         tip
parent:      1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

changeset:   3:443431ffac4f
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     e

changeset:   2:65bd5f99a4a3
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     d

changeset:   1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

changeset:   0:9ab35a2d17cb
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     a

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% before strip of merge parent
changeset:   2:65bd5f99a4a3
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     d

changeset:   4:264128213d29
tag:         tip
parent:      1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     c

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to 
% after strip of merge parent
changeset:   1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@  changeset:   4:264128213d29
|  tag:         tip
|  parent:      1:ef3a871183d7
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     c
|
| o  changeset:   3:443431ffac4f
| |  user:        test
| |  date:        Thu Jan 01 00:00:00 1970 +0000
| |  summary:     e
| |
| o  changeset:   2:65bd5f99a4a3
|/   user:        test
|    date:        Thu Jan 01 00:00:00 1970 +0000
|    summary:     d
|
o  changeset:   1:ef3a871183d7
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     b
|
o  changeset:   0:9ab35a2d17cb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a

% 2 is parent of 3, only one strip should happen
saved backup bundle to 
@  changeset:   2:264128213d29
|  tag:         tip
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     c
|
o  changeset:   1:ef3a871183d7
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     b
|
o  changeset:   0:9ab35a2d17cb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a

o  changeset:   4:443431ffac4f
|  tag:         tip
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     e
|
o  changeset:   3:65bd5f99a4a3
|  parent:      1:ef3a871183d7
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     d
|
| @  changeset:   2:264128213d29
|/   user:        test
|    date:        Thu Jan 01 00:00:00 1970 +0000
|    summary:     c
|
o  changeset:   1:ef3a871183d7
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     b
|
o  changeset:   0:9ab35a2d17cb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a

% 2 different branches: 2 strips
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to 
saved backup bundle to 
@  changeset:   2:65bd5f99a4a3
|  tag:         tip
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     d
|
o  changeset:   1:ef3a871183d7
|  user:        test
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     b
|
o  changeset:   0:9ab35a2d17cb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a

% 2 different branches and a common ancestor: 1 strip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to 
saved backup bundle to 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% applied patches before strip
2.diff
3.diff
4.diff
% stripping revision in queue
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to 
% applied patches after stripping rev in queue
2.diff
% stripping ancestor of queue
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to 
% applied patches after stripping ancestor of queue