Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-incoming-outgoing.out @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents e3a0c092b4e2
children
line wrap: on
line source

adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 9 changesets, 9 total revisions
comparing with http://localhost/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

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

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with http://localhost/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

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

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

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

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

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

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

comparing with http://localhost/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

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

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

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

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 14 changesets, 14 total revisions
comparing with test
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11

changeset:   12:251354d0fdd3
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     12

changeset:   13:bdaadd969642
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     13

comparing with http://localhost/
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11

changeset:   12:251354d0fdd3
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     12

changeset:   13:bdaadd969642
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     13

comparing with http://localhost/
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11