tests/test-flags.out
author Chris Mason <mason@suse.com>
Thu, 20 Apr 2006 13:08:16 -0400
changeset 2101 c6c019fd5db1
parent 2019 ced2d3620f95
child 2175 b2ae81a7df29
permissions -rw-r--r--
Make bundlerepo use proper index format for revlogng bundlerepo just appends index entries from the bundle onto the index for the current repo. This patch makes sure it appends the correct format.

pulling from ../test1
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
(run 'hg update' to get a working copy)
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
changeset:   2:b833d578451e
tag:         tip
parent:      0:4536b1c2ca69
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     chmod +x a

changeset:   1:a187cb361a5a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     a updated

changeset:   2:b833d578451e
tag:         tip
parent:      0:4536b1c2ca69
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     chmod +x a

changeset:   1:a187cb361a5a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     a updated

changeset:   0:4536b1c2ca69
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     added a b

resolving manifests
merging a
resolving a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-rwxr-x---
-rwxr-x---