Mercurial Mercurial > mercurial / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-incoming-outgoing.out
author Gilles Moris <gilles.moris@free.fr>
Thu, 21 Feb 2008 08:52:52 +0100
changeset 6161 bc1ba9124799
parent 5384 e3a0c092b4e2
child 6191 01594b0c86e2
permissions -rw-r--r--
Reverse the way backout is doing the merge Currently, backout is creating a backout revision as a child node of the backed out node and will leave you at this new head. This has several drawbacks: * this changes the current head * when there is a long history between the backed out node and the current head, this will generate a huge number of diffs that are scary at first sight, and not very natural to review before commit. The change consists to switch back to the original node as soon as the backout node (which becomes the new tip) has been created. Then the --merge option can just merge this new tip in the current node. * the current head/node is not changed from the user's point of view * even without using the --merge option, the backout revision is still easy to locate, as this is the tip * the merge is much more intuitive as diffs of the merge is right you are looking to backout

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
mercurial