view tests/test-flags.out @ 4398:3b7e284b8f28

merge: expand and simplify the invalid handling for directory moves
author Matt Mackall <mpm@selenic.com>
date Thu, 03 May 2007 17:24:43 -0500
parents b7a46cbf3f59
children
line wrap: on
line source

2 files updated, 0 files merged, 0 files removed, 0 files unresolved
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)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
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:d54568174d8e
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     b 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:d54568174d8e
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     b updated

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

resolving manifests
getting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-rwxr-x---
-rwxr-x---
-rwxr-x---
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       0      0       0 b80de5d13875 000000000000 000000000000
     1         0       0      0       2 37c42bd6cc03 b80de5d13875 000000000000
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       0      0       0 b80de5d13875 000000000000 000000000000
     1         0       0      0       1 37c42bd6cc03 b80de5d13875 000000000000
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       0      0       0 b80de5d13875 000000000000 000000000000
     1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000
     2         5       0      2       2 37c42bd6cc03 b80de5d13875 000000000000