view tests/test-mq-strip.out @ 10185:7637fe4f525d stable

mq: preserve --git flag when merging patches

Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.

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
saving 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
saving 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

saving 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

saving bundle to 
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
% 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
saving 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
saving 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
saving bundle to 
% after strip of merge parent
changeset:   1:ef3a871183d7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     b